diff --git a/resources/recipes/harpers.recipe b/resources/recipes/harpers.recipe index b2df3c00aa..f69eaccff1 100644 --- a/resources/recipes/harpers.recipe +++ b/resources/recipes/harpers.recipe @@ -1,7 +1,5 @@ -#!/usr/bin/env python - __license__ = 'GPL v3' -__copyright__ = '2008-2009, Darko Miletic ' +__copyright__ = '2008-2010, Darko Miletic ' ''' harpers.org ''' @@ -11,8 +9,7 @@ from calibre.ebooks.BeautifulSoup import Tag class Harpers(BasicNewsRecipe): title = u"Harper's Magazine" __author__ = u'Darko Miletic' - language = 'en' - + language = 'en' description = u"Harper's Magazine: Founded June 1850." publisher = "Harper's Magazine " category = 'news, politics, USA' @@ -21,13 +18,12 @@ class Harpers(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False - html2lrf_options = [ - '--comment', description - , '--category', category - , '--publisher', publisher - ] - - html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"' + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } extra_css = ''' h1{ font-family:georgia ; color:#111111; font-size:large;} @@ -39,8 +35,9 @@ class Harpers(BasicNewsRecipe): keep_only_tags = [ dict(name='div', attrs={'id':'cached'}) ] remove_tags = [ dict(name='table', attrs={'class':['rcnt','rcnt topline']}) - ,dict(name=['link','object','embed']) + ,dict(name=['link','object','embed','meta','base']) ] + remove_attributes = ['width','height'] feeds = [(u"Harper's Magazine", u'http://www.harpers.org/rss/frontpage-rss20.xml')] @@ -49,20 +46,13 @@ class Harpers(BasicNewsRecipe): index = 'http://harpers.org/' soup = self.index_to_soup(index) link_item = soup.find(name = 'img',attrs= {'class':"cover"}) - print link_item if link_item: cover_url = 'http://harpers.org' + link_item['src'] - print cover_url return cover_url def preprocess_html(self, soup): - mcharset = Tag(soup,'meta',[("http-equiv","Content-Type"),("content","text/html; charset=utf-8")]) - soup.head.insert(1,mcharset) for item in soup.findAll(style=True): del item['style'] for item in soup.findAll(xmlns=True): del item['xmlns'] return soup - - - diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 8125298634..b00205e6d6 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -193,8 +193,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): 'Note: you can destroy your library ' 'using this feature. Changes are permanent. There ' 'is no undo function. You are strongly encouraged ' - 'to backup the metadata.db file in your library ' - 'before proceeding.')) + 'to back up your library before proceeding.')) self.s_r_error = None self.s_r_obj = None @@ -278,13 +277,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): field = unicode(self.search_field.currentText()) if not field or not self.s_r_obj: return - if self.s_r_backup_db.isChecked(): - self.db.commit() - src = self.db.dbpath - dest = self.db.dbpath+'.backup' - if os.path.exists(dest): - os.remove(dest) - shutil.copyfile(src, dest) fm = self.db.field_metadata[field] diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index 8e0feb55d9..d01d3e2ea8 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -329,17 +329,14 @@ Future conversion of these books will use the default settings. true - - - + + - Backup 'metadata.db' to 'metadata.db.backup' before applying changes - - - true + +