Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Newsweek recipe and Implement #2975 (Validation for i/o filenames in ebook-convert)

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-28 14:33:44 -06:00
parent 3f9af83513
commit 2c25153079
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/conversion/plumber.py
View File

@ -53,6 +53,8 @@ class Plumber(object):
''' '''
self.input = os.path.abspath(input) self.input = os.path.abspath(input)
self.output = os.path.abspath(output) self.output = os.path.abspath(output)
if self.input == self.output:
raise ValueError('Input file is the same as the output file')
self.log = log self.log = log
self.ui_reporter = report_progress self.ui_reporter = report_progress

1
src/calibre/web/feeds/recipes/recipe_newsweek.py
View File

@ -30,6 +30,7 @@ class Newsweek(BasicNewsRecipe):
remove_tags = [ remove_tags = [
{'class':['fwArticle noHr','fwArticle','subinfo','hdlBulletItem','head-content','navbar','link', 'ad', 'sponsorLinksArticle', 'mm-content', {'class':['fwArticle noHr','fwArticle','subinfo','hdlBulletItem','head-content','navbar','link', 'ad', 'sponsorLinksArticle', 'mm-content',
'inline-social-links-wrapper', 'email-article', 'inline-social-links-wrapper', 'email-article',
'inlineComponentRight',
'comments-and-social-links-wrapper', 'EmailArticleBlock']}, 'comments-and-social-links-wrapper', 'EmailArticleBlock']},
{'id' : ['footer', 'ticker-data', 'topTenVertical', {'id' : ['footer', 'ticker-data', 'topTenVertical',
'digg-top-five', 'mesothorax', 'nw-comments', 'digg-top-five', 'mesothorax', 'nw-comments',