diff --git a/resources/images/news/cnetjapan_digital.png b/resources/images/news/cnetjapan_digital.png new file mode 100644 index 0000000000..9a0dcc8f7f Binary files /dev/null and b/resources/images/news/cnetjapan_digital.png differ diff --git a/resources/images/news/cnetjapan_release.png b/resources/images/news/cnetjapan_release.png new file mode 100644 index 0000000000..9a0dcc8f7f Binary files /dev/null and b/resources/images/news/cnetjapan_release.png differ diff --git a/resources/images/news/yomiuri.png b/resources/images/news/yomiuri.png new file mode 100644 index 0000000000..4a197f888f Binary files /dev/null and b/resources/images/news/yomiuri.png differ diff --git a/resources/recipes/yomiuri.recipe b/resources/recipes/yomiuri.recipe index 39a085bf83..b3df1b58aa 100644 --- a/resources/recipes/yomiuri.recipe +++ b/resources/recipes/yomiuri.recipe @@ -8,7 +8,7 @@ from calibre.web.feeds.news import BasicNewsRecipe import re class YOLNews(BasicNewsRecipe): - title = u'YOMIURI ONLINE' + title = u'YOMIURI ONLINE(Latest)' __author__ = 'Hiroshi Miura' oldest_article = 1 max_articles_per_feed = 50 @@ -19,6 +19,7 @@ class YOLNews(BasicNewsRecipe): encoding = 'Shift_JIS' index = 'http://www.yomiuri.co.jp/latestnews/' remove_javascript = True + masthead_title = u'YOMIURI ONLINE' remove_tags_before = {'class':"article-def"} remove_tags = [{'class':"RelatedArticle"}, @@ -27,9 +28,7 @@ class YOLNews(BasicNewsRecipe): remove_tags_after = {'class':"date-def"} def parse_feeds(self): - feeds = BasicNewsRecipe.parse_feeds(self) - for curfeed in feeds: delList = [] for a,curarticle in enumerate(curfeed.articles): @@ -39,7 +38,6 @@ class YOLNews(BasicNewsRecipe): for d in delList: index = curfeed.articles.index(d) curfeed.articles[index:index+1] = [] - return feeds def parse_index(self): @@ -60,7 +58,6 @@ class YOLNews(BasicNewsRecipe): ,'url' :'http://www.yomiuri.co.jp' + itema['href'] ,'description':'' }) - feeds.append(('News', newsarticles)) - + feeds.append(('latest', newsarticles)) return feeds diff --git a/resources/recipes/yomiuri_world.recipe b/resources/recipes/yomiuri_world.recipe new file mode 100644 index 0000000000..0146ffa330 --- /dev/null +++ b/resources/recipes/yomiuri_world.recipe @@ -0,0 +1,63 @@ +__license__ = 'GPL v3' +__copyright__ = '2010, Hiroshi Miura ' +''' +www.yomiuri.co.jp +''' + +from calibre.web.feeds.news import BasicNewsRecipe +import re + +class YOLNews(BasicNewsRecipe): + title = u'YOMIURI ONLINE(World)' + __author__ = 'Hiroshi Miura' + oldest_article = 2 + max_articles_per_feed = 50 + description = 'Japanese traditional newspaper Yomiuri Online News/world news' + publisher = 'Yomiuri Online News' + category = 'news, japan' + language = 'ja' + encoding = 'Shift_JIS' + index = 'http://www.yomiuri.co.jp/world/' + remove_javascript = True + masthead_title = u"YOMIURI ONLINE" + + remove_tags_before = {'class':"article-def"} + remove_tags = [{'class':"RelatedArticle"}, + {'class':"sbtns"} + ] + remove_tags_after = {'class':"date-def"} + + def parse_feeds(self): + feeds = BasicNewsRecipe.parse_feeds(self) + for curfeed in feeds: + delList = [] + for a,curarticle in enumerate(curfeed.articles): + if re.search(r'rssad.jp', curarticle.url): + delList.append(curarticle) + if len(delList)>0: + for d in delList: + index = curfeed.articles.index(d) + curfeed.articles[index:index+1] = [] + return feeds + + def parse_index(self): + feeds = [] + soup = self.index_to_soup(self.index) + topstories = soup.find('ul',attrs={'class':'list-def'}) + if topstories: + newsarticles = [] + for itt in topstories.findAll('li'): + itema = itt.find('a',href=True) + if itema: + itd1 = itema.findNextSibling(text = True) + itd2 = itd1.findNextSibling(text = True) + itd3 = itd2.findNextSibling(text = True) + newsarticles.append({ + 'title' :itema.string + ,'date' :''.join([itd1, itd2, itd3]) + ,'url' :'http://www.yomiuri.co.jp' + itema['href'] + ,'description':'' + }) + feeds.append(('World', newsarticles)) + return feeds +