Check relative url earlier
This commit is contained in:
		
							
								
								
									
										6
									
								
								morss.py
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								morss.py
									
									
									
									
									
								
							@@ -273,6 +273,9 @@ def Fill(item, cache, feedurl='/', fast=False):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	log(item.link)
 | 
						log(item.link)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						# check relative urls
 | 
				
			||||||
 | 
						item.link = urlparse.urljoin(feedurl, item.link)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# feedburner
 | 
						# feedburner
 | 
				
			||||||
	feeds.NSMAP['feedburner'] = 'http://rssnamespace.org/feedburner/ext/1.0'
 | 
						feeds.NSMAP['feedburner'] = 'http://rssnamespace.org/feedburner/ext/1.0'
 | 
				
			||||||
	match = item.xval('feedburner:origLink')
 | 
						match = item.xval('feedburner:origLink')
 | 
				
			||||||
@@ -295,9 +298,6 @@ def Fill(item, cache, feedurl='/', fast=False):
 | 
				
			|||||||
			item.link = match[0]
 | 
								item.link = match[0]
 | 
				
			||||||
			log(item.link)
 | 
								log(item.link)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# check relative urls
 | 
					 | 
				
			||||||
	item.link = urlparse.urljoin(feedurl, item.link)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	# check unwanted uppercase title
 | 
						# check unwanted uppercase title
 | 
				
			||||||
	if len(item.title) > 20 and item.title.isupper():
 | 
						if len(item.title) > 20 and item.title.isupper():
 | 
				
			||||||
		item.title = item.title.title()
 | 
							item.title = item.title.title()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user