From 5ff65409916851ef1583015c2fb51c644be2c402 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 30 Dec 2010 23:12:19 -0700 Subject: [PATCH 1/2] Updated El Universal. Fixes #8059 (Downloaded newspapers in device and E-book viewer have text and link problems) --- resources/recipes/el_universal.recipe | 104 ++++---------------------- 1 file changed, 15 insertions(+), 89 deletions(-) diff --git a/resources/recipes/el_universal.recipe b/resources/recipes/el_universal.recipe index 1995d0f932..f053812c05 100644 --- a/resources/recipes/el_universal.recipe +++ b/resources/recipes/el_universal.recipe @@ -1,7 +1,5 @@ -#!/usr/bin/env python - __license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' +__copyright__ = '2009-2010, Darko Miletic ' ''' eluniversal.com.mx ''' @@ -18,75 +16,25 @@ class ElUniversal(BasicNewsRecipe): category = 'news, politics, Mexico' no_stylesheets = True use_embedded_content = False - encoding = 'cp1252' + encoding = 'utf8' remove_javascript = True - language = 'es' + remove_empty_feeds = True + publication_type = 'newspaper' + language = 'es' extra_css = ''' - body{font-family:Arial,Helvetica,sans-serif; font-size:x-small;} - .geoGris30{font-family:Georgia,"Times New Roman",Times,serif; font-size:large; color:#003366; font-weight:bold;} - .arnegro16{font-family:Georgia,"Times New Roman",Times,serif; font-weight:bold; font-size:small;} - .tbazull2{font-family:"trebuchet ms",Arial,Helvetica,sans-serif; color:#336699; font-size:xx-small;} - .tbgrisf11{font-family:"trebuchet ms",Arial,Helvetica,sans-serif; color: #666666; font-size:xx-small;} - .verrojo13{font-family:"trebuchet ms",Arial,Helvetica,sans-serif; color: #CC0033; font-size:xx-small;} - .trnegro13{font-family:"trebuchet ms",Arial,Helvetica,sans-serif; font-size:xx-small;} - .txt-fotogaleria{font-family:"trebuchet ms",Arial,Helvetica,sans-serif; font-size:xx-small;} + body{font-family:Arial,Helvetica,sans-serif} + .noteTitle{font-family: Georgia,"Times New Roman",Times,serif; color: #336699; font-size: xx-large; font-weight: bold} + .noteInfo{display: block; color: gray} ''' - keep_only_tags = [ dict(name='table', attrs={'width':"633"}),dict(name='table', attrs={'width':"629"}),] - + keep_only_tags = [ dict(name='div', attrs={'id':'noteContent'})] + remove_tags_after = dict(attrs={'class':'noteText'}) remove_tags = [ - dict(name='table', attrs={'bgcolor':"#f5f5f5"}), - dict(name='td', attrs={'bgcolor':"#f7f8f9"}), - dict(name='td', attrs={'bgcolor':"#f5f5f5"}), - dict(name='table', attrs={'width':"302"}), - dict(name='table', attrs={'width':"214"}), - dict(name='table', attrs={'width':"112"}), - dict(name='table', attrs={'width':"980"}), - dict(name='td', attrs={'height':"1"}), - dict(name='td', attrs={'height':"4"}), - dict(name='td', attrs={'height':"20"}), - dict(name='td', attrs={'height':"10"}), - dict(name='td', attrs={'class':["trrojo11","trbris11","trrojo12","arrojo12s","tbazul13"]}), - dict(name='div', attrs={'id':["mapg","ver_off_todosloscom","todosloscom"]}), - dict(name='span', attrs={'class':["trazul18b","trrojo11","trnaranja11","trbris11","georojo18b","geogris18"]}), - dict(name='span', attrs={'class':["detalles-opinion"]}), - dict(name='a', attrs={'class':["arnaranja12b","trbris11","arazul12rel","trrojo10"]}), - dict(name='img', src = "/img/icono_imprimir.gif"), - dict(name='img', src = "/img/icono_enviar_mail.gif"), - dict(name='img', src = "/img/icono_fuente_g.gif"), - dict(name='img', src = "/img/icono_fuente_m.gif"), - dict(name='img', src = "/img/icono_fuente_c.gif"), - dict(name='img', src = "/img/icono_compartir.gif"), - dict(name='img', src = "/img/icono_enviar_coment.gif"), - dict(name='img', src = "http://www.eluniversal.com.mx/n_img/bot-notasrel.gif"), - dict(name='img', src = "http://www.eluniversal.com.mx/n_img/fr.gif"), - dict(name='img', src = "/img/espiral2.gif"), - dict(name='img', src = "http://www.eluniversal.com.mx/n_img/b"), - dict(name='img', src = "/img/icono_enviar_coment.gifot-notasrel.gif"), - dict(name='img', src = "/n_img/icono_tipo3.gif"), - dict(name='img', src = "/n_img/icono_tipo2.gif"), - dict(name='img', src = "/n_img/icono_print.gif"), - dict(name='img', src = "/n_img/icono_mail2.gif"), - dict(name='img', src = "/n_img/im-comentarios-2a.gif"), - dict(name='img', src = "/n_img/im-comentarios-1a.gif"), - dict(name='img', src = "/img/icono_coment.gif"), - dict(name='img', src = "http://www.eluniversal.com.mx/n_img/bot-sitiosrel.gif"), - dict(name='img', src = "/n_img/icono_tipomenos.gif"), - dict(name='img', src = "/img/futbol/19.jpg"), - dict(name='img', alt = "Facebook"), - dict(name='img', alt = "Twitter"), - dict(name='img', alt = "Google"), - dict(name='img', alt = "LinkedIn"), - dict(name='img', alt = "Viadeo"), - dict(name='img', alt = "Digg"), - dict(name='img', alt = "Delicious"), - dict(name='img', alt = "Meneame"), - dict(name='img', alt = "Yahoo"), - dict(name='img', alt = "Technorati"), - dict(name='a',text =["Compartir","Facebook","Twitter","Google","LinkedIn","Viadeo","Digg","Delicious","Meneame","Yahoo","Technorati"]), - dict(name='select'), - dict(name='a', attrs={'class':"tbgriscompartir"}), - ] + dict(attrs={'class':'noteExtras'}), + dict(name=['meta','iframe','base','embed','object']), + dict(attrs={'id':'tm_box'}) + ] + remove_attributes=['lang','onclick'] feeds = [ (u'Minuto por Minuto', u'http://www.eluniversal.com.mx/rss/universalmxm.xml' ) @@ -101,25 +49,3 @@ class ElUniversal(BasicNewsRecipe): ,(u'Computacion' , u'http://www.eluniversal.com.mx/rss/computo.xml' ) ,(u'Sociedad' , u'http://www.eluniversal.com.mx/rss/sociedad.xml' ) ] - - # def print_version(self, url): - # return url.replace('/notas/','/notas/vi_') - - def preprocess_html(self, soup): - mtag = '' - soup.head.insert(0,mtag) - for tag in soup.findAll(name='td',attrs={'class': 'arazul50'}): - tag.insert(0,"

") - tag.insert(2,"

") - - return soup - - def postprocess_html(self, soup,first): - - for tag in soup.findAll(name=['table', 'span','i']): - tag.name = 'div' - for item in soup.findAll(align = "right"): - del item['align'] - - return soup - From 82ffe9d10775e52852385d3454f3650bbebfcd46 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 30 Dec 2010 23:26:25 -0700 Subject: [PATCH 2/2] Add a tweak to control the delay when sending mails using gmail or hotmail. Fixes #8064 (Email 5 Min. Added to Options) --- resources/default_tweaks.py | 8 ++++++++ src/calibre/gui2/email.py | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index a2a9a0a043..7eafc5b357 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -315,3 +315,11 @@ locale_for_sorting = '' # metadata one book at a time. If True, then the fields are laid out using two # columns. If False, one column is used. metadata_single_use_2_cols_for_custom_fields = True + +# The number of seconds to wait before sending emails when using a +# public email server like gmail or hotmail. Default is: 5 minutes +# Setting it to lower may cause the server's SPAM controls to kick in, +# making email sending fail. Changes will take effect only after a restart of +# calibre. +public_smtp_relay_delay = 301 + diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py index 2911222ba8..6b2ed81413 100644 --- a/src/calibre/gui2/email.py +++ b/src/calibre/gui2/email.py @@ -22,6 +22,7 @@ from calibre.customize.ui import available_input_formats, available_output_forma from calibre.ebooks.metadata import authors_to_string from calibre.constants import preferred_encoding from calibre.gui2 import config, Dispatcher, warning_dialog +from calibre.utils.config import tweaks class EmailJob(BaseJob): # {{{ @@ -83,7 +84,7 @@ class Emailer(Thread): # {{{ rh = opts.relay_host if rh and ( 'gmail.com' in rh or 'live.com' in rh): - self.rate_limit = 301 + self.rate_limit = tweaks['public_smtp_relay_delay'] def stop(self): self._run = False