mirror of
				https://github.com/kovidgoyal/calibre.git
				synced 2025-10-31 02:27:01 -04:00 
			
		
		
		
	Fix #3902 (CNN articles are trailers only)
This commit is contained in:
		
							parent
							
								
									d07738ccd2
								
							
						
					
					
						commit
						36e90c8348
					
				| @ -16,44 +16,60 @@ class CNN(BasicNewsRecipe): | |||||||
|     no_stylesheets = True |     no_stylesheets = True | ||||||
|     use_embedded_content   = False |     use_embedded_content   = False | ||||||
|     oldest_article        = 15 |     oldest_article        = 15 | ||||||
|  |     recursions = 1 | ||||||
|  |     match_regexps = [r'http://sportsillustrated.cnn.com/.*/[1-9].html'] | ||||||
|      |      | ||||||
|     extra_css = ''' |     extra_css = ''' | ||||||
|                 h1{font-family :Arial,Helvetica,sans-serif; font-size:large} |                 .cnn_strycntntlft{font-family :Arial,Helvetica,sans-serif;} | ||||||
|                 h2{font-family :Arial,Helvetica,sans-serif; font-size:x-small} |                 h2{font-family :Arial,Helvetica,sans-serif; font-size:x-small} | ||||||
|                 .cnnTxtCmpnt{font-family :Arial,Helvetica,sans-serif; font-size:x-small} |                 .cnnTxtCmpnt{font-family :Arial,Helvetica,sans-serif; font-size:x-small} | ||||||
|                 .cnnTMcontent{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;color:#575757} |                 .cnnTMcontent{font-family :Arial,Helvetica,sans-serif; font-size:x-small;color:#575757} | ||||||
|                 .storytext{font-family :Arial,Helvetica,sans-serif; font-size:x-small} |                 .storytext{font-family :Arial,Helvetica,sans-serif; font-size:small} | ||||||
|                 .storybyline{font-family :Arial,Helvetica,sans-serif; font-size:xx-small; color:#575757} |                 .storybyline{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#575757} | ||||||
|                 .credit{font-family :Arial,Helvetica,sans-serif; font-size:xx-small; color:#575757} |                 .credit{font-family :Arial,Helvetica,sans-serif; font-size:xx-small; color:#575757} | ||||||
|                 .storyBrandingBanner{font-family :Arial,Helvetica,sans-serif; font-size:xx-small; color:#575757} |                 .storyBrandingBanner{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#575757} | ||||||
|                 .storytimestamp{font-family :Arial,Helvetica,sans-serif; font-size:xx-small; color:#575757} |                 .storytimestamp{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#575757} | ||||||
|                 .timestamp{font-family :Arial,Helvetica,sans-serif; font-size:xx-small; color:#575757} |                 .timestamp{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#575757} | ||||||
|                 .subhead p{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;} |                 .cnn_strytmstmp{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} | ||||||
|                 .cnnStoryContent{font-family :Arial,Helvetica,sans-serif; font-size:xx-small} |                 .cnn_stryimg640caption{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} | ||||||
|                 .cnnContentContainer{font-family :Arial,Helvetica,sans-serif; font-size:xx-small} |                 .cnn_strylccimg300cntr{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} | ||||||
|  |                 .cnn_stryichgfcpt{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} | ||||||
|  |                 .cnnByline{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} | ||||||
|  |                 .cnn_bulletbin cnnStryHghLght{ font-size:xx-small;} | ||||||
|  |                 .subhead p{font-family :Arial,Helvetica,sans-serif; font-size:x-small;} | ||||||
|  |                 .cnnStoryContent{font-family :Arial,Helvetica,sans-serif; font-size:x-small} | ||||||
|  |                 .cnnContentContainer{font-family :Arial,Helvetica,sans-serif; font-size:x-small} | ||||||
|                 .col1{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} |                 .col1{font-family :Arial,Helvetica,sans-serif; font-size:x-small; color:#666666;} | ||||||
|                 .col3{color:#333333; font-family :Arial,Helvetica,sans-serif; font-size:x-small;font-weight:bold;} |                 .col3{color:#333333; font-family :Arial,Helvetica,sans-serif; font-size:x-small;font-weight:bold;} | ||||||
|                 .cnnInlineT1Caption{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;font-weight:bold;} |                 .cnnInlineT1Caption{font-family :Arial,Helvetica,sans-serif; font-size:x-small;font-weight:bold;} | ||||||
|                 .cnnInlineT1Credit{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;color:#333333;} |                 .cnnInlineT1Credit{font-family :Arial,Helvetica,sans-serif; font-size:x-small;color:#333333;} | ||||||
|                 .col10{color:#5A637E} |                 .col10{color:#5A637E;} | ||||||
|                 .cnnTimeStamp{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;color:#333333;} |                 .cnnInlineRailBulletList{color:black;}                 | ||||||
|                 .galleryhedDek{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;color:#575757;} |                 .cnnLine0{font-family :Arial,Helvetica,sans-serif; color:#666666;font-weight:bold;} | ||||||
|                 .galleryWidgetHeader{font-family :Arial,Helvetica,sans-serif; font-size:xx-small;color:#004276;} |                 .cnnTimeStamp{font-family :Arial,Helvetica,sans-serif; font-size:x-small;color:#333333;} | ||||||
|                 .article-content{font-family :Arial,Helvetica,sans-serif; font-size:xx-small} |                 .galleryhedDek{font-family :Arial,Helvetica,sans-serif; font-size:x-small;color:#575757;} | ||||||
|                 .cnnRecapStory{font-family :Arial,Helvetica,sans-serif; font-size:xx-small} |                 .galleryWidgetHeader{font-family :Arial,Helvetica,sans-serif; font-size:x-small;color:#004276;} | ||||||
|  |                 .article-content{font-family :Arial,Helvetica,sans-serif; font-size:x-small} | ||||||
|  |                 .cnnRecapStory{font-family :Arial,Helvetica,sans-serif; font-size:x-small} | ||||||
|  |                 h1{font-family :Arial,Helvetica,sans-serif; font-size:x-large} | ||||||
|  |                 .captionname{font-family :Arial,Helvetica,sans-serif; font-size:x-small;color:#575757;} | ||||||
|  |                 inStoryIE{{font-family :Arial,Helvetica,sans-serif; font-size:x-small;} | ||||||
|                 ''' |                 ''' | ||||||
|     keep_only_tags = [ |     keep_only_tags = [ | ||||||
|                         dict(name='div', attrs={'class':["cnnWCBoxContent","cnnContent","cnnMainBodySecs"]}), |                         dict(name='div', attrs={'class':["cnnWCBoxContent","cnnContent","cnnMainBodySecs","cnn_storyarea","cnn_strycntntlft","cnn_strytmstmp"]}), | ||||||
|                          dict(name='div', attrs={'id':["contentBody","content"]}), |                          dict(name='div', attrs={'id':["contentBody","content"]}), | ||||||
|                          dict(name='td', attrs={'id':["cnnRecapStory"]}),] |                          dict(name='td', attrs={'id':["cnnRecapStory"]}), | ||||||
|  |                         dict(name='td', attrs={'class':["cnnBigSideLeft"]}), | ||||||
|  |                           ] | ||||||
|     remove_tags =   [ |     remove_tags =   [ | ||||||
|                         dict(name='div', attrs={'class':["storyLink","article-tools clearfix","widget video related-video vList","cnnFooterBox","scrollArrows","boxHeading","cnnInlineMailbag","mainCol_lastBlock","cnn_bookmarks","cnnFooterBox","cnnEndOfStory","cnnInlineSL","cnnStoryHighlights","cnnFooterClick","cnnSnapShotHeader","cnnStoryToolsFooter","cnnWsnr","cnnUGCBox","cnnTopNewsModule","cnnStoryElementBox","cnnStoryPhotoBoxNavigation"]}), |                         dict(name='div', attrs={'class':["cnnInlineRailSelectList","cnn_strycntntrgt","cnn_strybtntools","cnn_strylctcntr cnn_strylctcqrelt","cnn_strylceclbtn","cnn_stryftsbttm","cnn_strybtmmorebx","storyLink","article-tools clearfix","widget video related-video vList","cnnFooterBox","scrollArrows","boxHeading","cnnInlineMailbag","mainCol_lastBlock","cnn_bookmarks","cnnFooterBox","cnnEndOfStory","cnnInlineSL","cnnStoryHighlights","cnnFooterClick","cnnSnapShotHeader","cnnStoryToolsFooter","cnnWsnr","cnnUGCBox","cnnTopNewsModule","cnnStoryElementBox","cnnStoryPhotoBoxNavigation"]}), | ||||||
|                         dict(name='span', attrs={'class':["cnnEmbeddedMosLnk"]}), |                         dict(name='span', attrs={'class':["cnnEmbeddedMosLnk"]}), | ||||||
|                         dict(name='div', attrs={'id':["cnnIncldHlder","articleCommentsContainer","featuredContent","superstarsWidget","shareMenuContainer","rssMenuContainer","storyBrandingBanner","cnnRightCol","siteFeatures","quigo628","rightColumn","clickIncludeBox","cnnHeaderRightCol","cnnSCFontLabel","cnnSnapShotBottomRight","cnnSCFontButtons","rightColumn"]}), |                         dict(name='div', attrs={'id':["cnnIncldHlder","articleCommentsContainer","featuredContent","superstarsWidget","shareMenuContainer","rssMenuContainer","storyBrandingBanner","cnnRightCol","siteFeatures","quigo628","rightColumn","clickIncludeBox","cnnHeaderRightCol","cnnSCFontLabel","cnnSnapShotBottomRight","cnnSCFontButtons","rightColumn"]}), | ||||||
|                         dict(name='p', attrs={'class':["cnnTopics"]}), |                         dict(name='p', attrs={'class':["cnnTopics"]}), | ||||||
|                         dict(name='td', attrs={'class':["cnnRightRail"]}), |                         dict(name='td', attrs={'class':["cnnRightRail"]}), | ||||||
|                         dict(name='table', attrs={'class':["cnnTMbox"]}), |                         dict(name='table', attrs={'class':["cnnTMbox"]}), | ||||||
|                         dict(name='ul', attrs={'id':["cnnTopNav","cnnBotNav","cnnSBNav"]}), |                         dict(name='ul', attrs={'id':["cnnTopNav","cnnBotNav","cnnSBNav"]}), | ||||||
|  |                         dict(name='div', attrs={'id':["cnn_ftrcntnt"]}) | ||||||
|                         ] |                         ] | ||||||
| 
 | 
 | ||||||
|    # def print_version(self, url): |    # def print_version(self, url): | ||||||
| @ -75,3 +91,10 @@ class CNN(BasicNewsRecipe): | |||||||
|              ('Offbeat', 'http://rss.cnn.com/rss/cnn_offbeat.rss'), |              ('Offbeat', 'http://rss.cnn.com/rss/cnn_offbeat.rss'), | ||||||
|              ('Most Popular', 'http://rss.cnn.com/rss/cnn_mostpopular.rss') |              ('Most Popular', 'http://rss.cnn.com/rss/cnn_mostpopular.rss') | ||||||
|              ] |              ] | ||||||
|  | 
 | ||||||
|  |     def preprocess_html(self, soup): | ||||||
|  | 
 | ||||||
|  |           for tag in soup.findAll(name=['ul','li']): | ||||||
|  |                 tag.name = 'div' | ||||||
|  | 
 | ||||||
|  |           return soup | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user