diff --git a/resources/recipes/novosti.recipe b/resources/recipes/novosti.recipe index eecae620e4..0465b59e17 100644 --- a/resources/recipes/novosti.recipe +++ b/resources/recipes/novosti.recipe @@ -37,6 +37,16 @@ class Novosti(BasicNewsRecipe): preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')] keep_only_tags = [dict(attrs={'class':['articleTitle','author','articleLead','articleBody']})] - remove_tags = [dict(name=['embed','object','iframe','base'])] - + remove_tags = [dict(name=['embed','object','iframe','base','link','meta'])] feeds = [(u'Vesti', u'http://www.novosti.rs/rss/rss-vesti')] + + def preprocess_html(self, soup): + for item in soup.findAll(style=True): + del item['style'] + for item in soup.findAll('span', attrs={'class':'author'}): + item.name='p' + for item in soup.findAll('img'): + if not item.has_key('alt'): + item['alt'] = 'image' + return soup + \ No newline at end of file diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index ba3176c0af..b00205e6d6 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -178,18 +178,18 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.book_1_text.setObjectName(name) self.gridLayout1.addWidget(w, i+offset, 2, 1, 1) - self.s_r_heading.setText( + self.s_r_heading.setText('

'+ _('Search and replace in text fields using ' 'regular expressions. The search text is an ' 'arbitrary python-compatible regular expression. ' 'The replacement text can contain backreferences ' 'to parenthesized expressions in the pattern. ' 'The search is not anchored, and can match and ' - 'replace times on the same string. See ' + 'replace multiple times on the same string. See ' ' ' - 'http://docs.python.org/library/re.html ' + 'this reference ' 'for more information, and in particular the \'sub\' ' - 'function.
' + 'function.') + '

' + _( 'Note: you can destroy your library ' 'using this feature. Changes are permanent. There ' 'is no undo function. You are strongly encouraged ' diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index 251b3423b3..d01d3e2ea8 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -7,7 +7,7 @@ 0 0 572 - 554 + 703 @@ -295,6 +295,19 @@ Future conversion of these books will use the default settings. + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -327,21 +340,30 @@ Future conversion of these books will use the default settings. - Search field: + Search &field: + + + search_field - Search for: + &Search for: + + + search_for - Replace with: + &Replace with: + + + replace_with @@ -357,7 +379,10 @@ Future conversion of these books will use the default settings. - Apply function after replace: + Apply function &after replace: + + + replace_func @@ -367,14 +392,20 @@ Future conversion of these books will use the default settings. - Test text + Test &text + + + test_text - Test result + Test re&sult + + + test_result