Pull from trunk

resources/recipes/agrogerila.recipe

@@ -0,0 +1,40 @@
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+boljevac.blogspot.com
+'''
+
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AgroGerila(BasicNewsRecipe):
+    title                 = 'Agro Gerila'
+    __author__            = 'Darko Miletic'
+    description           = 'Politicki nekorektan blog.'
+    oldest_article        = 45
+    max_articles_per_feed = 100
+    language              = 'sr'
+    encoding              = 'utf-8'
+    no_stylesheets        = True
+    use_embedded_content  = True
+    publication_type      = 'blog'
+    extra_css             = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: "Trebuchet MS",Trebuchet,Verdana,sans1,sans-serif} .article_description{font-family: sans1, sans-serif} img{margin-bottom: 0.8em; border: 1px solid #333333; padding: 4px } '
+
+    conversion_options = {
+                          'comment'  : description
+                        , 'tags'     : 'film, blog, srbija'
+                        , 'publisher': 'Dry-Na-Nord'
+                        , 'language' : language
+                        }
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    feeds = [(u'Posts', u'http://boljevac.blogspot.com/feeds/posts/default')]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return self.adeify_images(soup)
+
+

resources/recipes/libero.recipe

@@ -15,7 +15,7 @@ class LiberoNews(BasicNewsRecipe):
     description    = 'Italian daily newspaper'
 
     cover_url      = 'http://www.ilgiornale.it/img_v1/logo.gif'
-    title          = u'Libero '
+    title          = u'Libero'
     publisher      = 'EDITORIALE LIBERO s.r.l 2006'
     category       = 'News, politics, culture, economy, general interest'
 
@@ -48,7 +48,7 @@ class LiberoNews(BasicNewsRecipe):
              (u'Tecnologia', u'http://www.libero-news.it/rss.jsp?sezione=20'),
              (u'LifeStyle', u'http://www.libero-news.it/rss.jsp?sezione=22'),
              (u'Sport', u'http://www.libero-news.it/rss.jsp?sezione=23'),
-             (u'Costume e Società', u' http://www.libero-news.it/rss.jsp?sezione=24'),
+             (u'Costume e Societ\xc3\xa0', u' http://www.libero-news.it/rss.jsp?sezione=24'),
              (u'Milano', u'http://www.libero-news.it/rss.jsp?sezione=26'),
              (u'Roma', u'http://www.libero-news.it/rss.jsp?sezione=27'),
              (u'Alimentazione', u'http://www.libero-news.it/rss.jsp?sezione=29')

resources/recipes/nin.recipe

@@ -5,7 +5,7 @@ __copyright__ = '2008-2010, Darko Miletic <darko.miletic at gmail.com>'
 www.nin.co.rs
 '''
 
-import re, urllib
+import re
 from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
 
@@ -16,13 +16,13 @@ class Nin(BasicNewsRecipe):
     publisher              = 'NIN d.o.o.'
     category               = 'news, politics, Serbia'
     no_stylesheets         = True
+    delay                  = 1
     oldest_article         = 15
     encoding               = 'utf-8'
     needs_subscription     = True
     remove_empty_feeds     = True
     PREFIX                 = 'http://www.nin.co.rs'
     INDEX                  = PREFIX + '/?change_lang=ls'
-    LOGIN                  = PREFIX + '/?logout=true'
     use_embedded_content   = False
     language               = 'sr'
     publication_type       = 'magazine'
@@ -41,14 +41,12 @@ class Nin(BasicNewsRecipe):
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser()
-        br.open(self.INDEX)
         if self.username is not None and self.password is not None:
-            data = urllib.urlencode({ 'login_name':self.username
-                                     ,'login_password':self.password
-                                     ,'imageField.x':'32'
-                                     ,'imageField.y':'15'
-                                   })
-            br.open(self.LOGIN,data)
+            br.open(self.INDEX)
+            br.select_form(name='form1')
+            br['login_name'    ] = self.username
+            br['login_password'] = self.password
+            br.submit()
         return br
 
     keep_only_tags    =[dict(name='td', attrs={'width':'520'})]

src/calibre/devices/misc.py

@@ -48,6 +48,7 @@ class KOBO(USBMS):
     WINDOWS_MAIN_MEM = '.KOBOEREADER'
 
     EBOOK_DIR_MAIN = ''
+    SUPPORTS_SUB_DIRS = True
 
 class AVANT(USBMS):
     name           = 'Booq Avant Device Interface'

src/calibre/gui2/library.py

@@ -973,8 +973,8 @@ class BooksModel(QAbstractTableModel):
                     self.db.set(row, column, val)
             self.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), \
                                 index, index)
-            if column == self.sorted_on[0]:
-                self.resort()
+            #if column == self.sorted_on[0]:
+            #    self.resort()
         return True
 
     def set_search_restriction(self, s):