Sync to trunk.

recipes/telepolis.recipe

@@ -1,17 +1,12 @@
 # -*- coding: utf-8 -*-
 
-__license__   = 'GPL v3'
-__copyright__ = '2009, Gerhard Aigner <gerhard.aigner at gmail.com>'
-
-
-import re
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class TelepolisNews(BasicNewsRecipe):
     title          = u'Telepolis (News+Artikel)'
-    __author__ = 'Gerhard Aigner'
+    __author__ = 'syntaxis'
     publisher = 'Heise Zeitschriften Verlag GmbH & Co KG'
-    description = 'News from telepolis'
+    description = 'News from Telepolis'
     category = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
@@ -20,14 +15,19 @@ class TelepolisNews(BasicNewsRecipe):
     encoding = "utf-8"
     language = 'de'
 
-    use_embedded_content =False
+
     remove_empty_feeds = True
 
-    preprocess_regexps = [(re.compile(r'<a[^>]*>', re.DOTALL|re.IGNORECASE), lambda match: ''),
-        (re.compile(r'</a>', re.DOTALL|re.IGNORECASE), lambda match: ''),]
 
-    keep_only_tags = [dict(name = 'td',attrs={'class':'bloghead'}),dict(name = 'td',attrs={'class':'blogfliess'})]
-    remove_tags = [dict(name='img'), dict(name='td',attrs={'class':'blogbottom'}), dict(name='td',attrs={'class':'forum'})]
+
+    keep_only_tags = [dict(name = 'div',attrs={'class':'head'}),dict(name = 'div',attrs={'class':'leftbox'}),dict(name='td',attrs={'class':'strict'})]
+    remove_tags = [ dict(name='td',attrs={'class':'blogbottom'}),
+            dict(name='div',attrs={'class':'forum'}), dict(name='div',attrs={'class':'social'}),dict(name='div',attrs={'class':'blog-letter p-news'}),
+            dict(name='div',attrs={'class':'blog-sub'}),dict(name='div',attrs={'class':'version-div'}),dict(name='div',attrs={'id':'breadcrumb'})
+            ,dict(attrs={'class':'tp-url'}),dict(attrs={'class':'blog-name entry_'}) ]
+
+    remove_tags_after  = [dict(name='span', attrs={'class':['breadcrumb']})]
+
 
     feeds          = [(u'News', u'http://www.heise.de/tp/news-atom.xml')]
 
@@ -39,15 +39,8 @@ class TelepolisNews(BasicNewsRecipe):
 
     html2epub_options  = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
 
-    def get_article_url(self, article):
-        '''if the linked article is of kind artikel don't take it'''
-        if (article.link.count('artikel') > 1) :
-            return None
-        return article.link
 
     def preprocess_html(self, soup):
         mtag = '<meta http-equiv="Content-Type" content="text/html; charset=' + self.encoding + '">'
         soup.head.insert(0,mtag)
         return soup
-
-

recipes/ziuaveche.recipe

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = u'2011, Silviu Cotoar\u0103'
+'''
+ziuaveche.ro
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ZiuaVeche(BasicNewsRecipe):
+    title                       = u'Ziua Veche'
+    __author__          = u'Silviu Cotoar\u0103'
+    description             = 'Cotidian online'
+    publisher                   = 'Ziua Veche'
+    oldest_article              = 5
+    language                    = 'ro'
+    max_articles_per_feed = 100
+    no_stylesheets          = True
+    use_embedded_content  = False
+    category                  = 'Ziare,Cotidiane,Stiri'
+    encoding                = 'utf-8'
+    cover_url     = 'http://www.ziuaveche.ro/wp-content/themes/tema/images/zv-logo-alb-old.png'
+
+    conversion_options = {
+                             'comments'  : description
+                            ,'tags'           : category
+                            ,'language'    : language
+                ,'publisher'   : publisher
+                         }
+
+
+    keep_only_tags = [
+        dict(name='div', attrs={'id':'singlePost'})
+
+                 ]
+
+    remove_tags = [
+            dict(name='div', attrs={'id':'LikePluginPagelet'})
+
+                          ]
+
+    remove_tags_after = [
+               dict(name='div', attrs={'id':'LikePluginPagelet'})
+           ]
+
+    feeds          = [
+        (u'Feeds', u'http://www.ziuaveche.ro/feed/rss')
+                     ]
+
+    def preprocess_html(self, soup):
+        return self.adeify_images(soup)

src/calibre/devices/apple/driver.py

@@ -205,7 +205,7 @@ class ITUNES(DriverBase):
     #  0x129a   iPad
     #  0x12a2   iPad2
     VENDOR_ID = [0x05ac]
-    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x12a2]
+    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x129f,0x12a2]
     BCD = [0x01]
 
     # Plugboard ID

src/calibre/ebooks/metadata/sources/amazon.py

@@ -338,7 +338,7 @@ class Amazon(Source):
                     q['field-author'] = ' '.join(author_tokens)
 
         if not ('field-keywords' in q or 'field-isbn' in q or
-                ('field-title' in q and 'field-author' in q)):
+                ('field-title' in q)):
             # Insufficient metadata to make an identify query
             return None
 

src/calibre/ebooks/metadata/sources/base.py

@@ -291,10 +291,10 @@ class Source(Plugin):
                     parts = parts[1:] + parts[:1]
                 for tok in parts:
                     tok = remove_pat.sub('', tok).strip()
-                    if len(tok) > 2 and tok.lower() not in ('von', ):
+                    if len(tok) > 2 and tok.lower() not in ('von', 'van',
+                            _('Unknown').lower()):
                         yield tok
 
-
     def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
         '''
         Take a title and return a list of tokens useful for an AND search query.

src/calibre/gui2/metadata/basic_widgets.py

@@ -1126,7 +1126,7 @@ class DateEdit(QDateEdit): # {{{
     @dynamic_property
     def current_val(self):
         def fget(self):
-            return qt_to_dt(self.date())
+            return qt_to_dt(self.date(), as_utc=False)
         def fset(self, val):
             if val is None:
                 val = UNDEFINED_DATE