Merge from trunk

resources/recipes/cbc_canada.recipe

@@ -0,0 +1,25 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1275798572(BasicNewsRecipe):
+    title          = u'CBC Canada'
+    publisher             = 'www.cbc.ca'
+    language = 'en_CA'
+    __author__ = 'rty'
+    category              = 'news'
+    oldest_article = 4
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en'
+    masthead_url = 'http://www.cbc.ca/includes/gfx/cbcnews_logo_09.gif'
+    cover_url = 'http://img692.imageshack.us/img692/2814/cbc.png'
+    keep_only_tags = [dict(name='div', attrs={'id':['storyhead','storybody']})]
+    remove_tags_after  = dict(id=['socialtools'])
+    feeds          = [(u'Top Stories', u'http://rss.cbc.ca/lineup/topstories.xml'),
+                          (u'World', u'http://rss.cbc.ca/lineup/world.xml'),
+                          (u'National', u'http://rss.cbc.ca/lineup/canada.xml'),
+                          (u'Manitoba', u'http://rss.cbc.ca/lineup/canada-manitoba.xml'),
+                          (u'Politics', u'http://rss.cbc.ca/lineup/politics.xml'),
+                          (u'Tech & Science', u'http://rss.cbc.ca/lineup/technology.xml'),
+                          (u'Books', u'http://rss.cbc.ca/lineup/arts-books.xml')]

resources/recipes/haaretz_en.recipe

@@ -0,0 +1,57 @@
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+haaretz.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Haaretz_en(BasicNewsRecipe):
+    title                 = 'Haaretz in English'
+    __author__            = 'Darko Miletic'
+    description           = 'Haaretz.com, the online edition of Haaretz Newspaper in Israel, and analysis from Israel and the Middle East. Haaretz.com provides extensive and in-depth coverage of Israel, the Jewish World and the Middle East, including defense, diplomacy, the Arab-Israeli conflict, the peace process, Israeli politics, Jerusalem affairs, international relations, Iran, Iraq, Syria, Lebanon, the Palestinian Authority, the West Bank and the Gaza Strip, the Israeli business world and Jewish life in Israel and the Diaspora. '
+    publisher             = 'haaretz.com'
+    category              = 'news, politics, Israel'
+    oldest_article        = 2
+    max_articles_per_feed = 200
+    no_stylesheets        = True
+    encoding              = 'cp1252'
+    use_embedded_content  = False
+    language              = 'en_IL'
+    publication_type      = 'newspaper'
+    remove_empty_feeds    = True
+    masthead_url          = 'http://www.haaretz.com/images/logos/logoGrey.gif'
+    extra_css             = ' body{font-family: Verdana,Arial,Helvetica,sans-serif } '
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    remove_tags = [dict(name='div', attrs={'class':['rightcol']}),dict(name='table')]
+    remove_tags_before = dict(name='h1')
+    remove_tags_after  = dict(attrs={'id':'innerArticle'})
+    keep_only_tags     = [dict(attrs={'id':'content'})]
+
+
+    feeds = [
+              (u'Opinion'               , u'http://www.haaretz.com/cmlink/opinion-rss-1.209234?localLinksEnabled=false'   )
+             ,(u'Defense and diplomacy' , u'http://www.haaretz.com/cmlink/defense-and-diplomacy-rss-1.208894?localLinksEnabled=false')
+             ,(u'National'              , u'http://www.haaretz.com/cmlink/national-rss-1.208896?localLinksEnabled=false'       )
+             ,(u'International'         , u'http://www.haaretz.com/cmlink/international-rss-1.208898?localLinksEnabled=false'      )
+             ,(u'Jewish World'          , u'http://www.haaretz.com/cmlink/jewish-world-rss-1.209085?localLinksEnabled=false'        )
+             ,(u'Business'              , u'http://www.haaretz.com/cmlink/business-print-rss-1.264904?localLinksEnabled=false'     )
+             ,(u'Real Estate'           , u'http://www.haaretz.com/cmlink/real-estate-print-rss-1.264977?localLinksEnabled=false'      )
+             ,(u'Features'              , u'http://www.haaretz.com/cmlink/features-print-rss-1.264912?localLinksEnabled=false'          )
+             ,(u'Arts and leisure'      , u'http://www.haaretz.com/cmlink/arts-and-leisure-rss-1.286090?localLinksEnabled=false'       )
+             ,(u'Books'                 , u'http://www.haaretz.com/cmlink/books-rss-1.264947?localLinksEnabled=false'         )
+             ,(u'Food and Wine'         , u'http://www.haaretz.com/cmlink/food-and-wine-print-rss-1.265034?localLinksEnabled=false'      )
+             ,(u'Sports'                , u'http://www.haaretz.com/cmlink/sports-rss-1.286092?localLinksEnabled=false'          )
+            ]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup

src/calibre/__init__.py

@@ -41,6 +41,8 @@ mimetypes.add_type('application/vnd.palm',                '.pdb')
 mimetypes.add_type('application/x-mobipocket-ebook',      '.mobi')
 mimetypes.add_type('application/x-mobipocket-ebook',      '.prc')
 mimetypes.add_type('application/x-mobipocket-ebook',      '.azw')
+mimetypes.add_type('application/x-cbz',                   '.cbz')
+mimetypes.add_type('application/x-cbr',                   '.cbr')
 mimetypes.add_type('image/wmf',                           '.wmf')
 guess_type = mimetypes.guess_type
 import cssutils

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.7.0'
+__version__   = '0.7.1'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re

src/calibre/gui2/lrf_renderer/main.py

@@ -152,7 +152,7 @@ class Main(MainWindow, Ui_MainWindow):
             self.stack.setCurrentIndex(1)
             self.renderer.start()
 
-    def find(self, search, refinement):
+    def find(self, search):
         self.last_search = search
         try:
             self.document.search(search)

src/calibre/gui2/viewer/main.py

@@ -424,7 +424,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
             self.set_bookmarks(self.iterator.bookmarks)
 
 
-    def find(self, text, refinement, repeat=False, backwards=False):
+    def find(self, text, repeat=False, backwards=False):
         if not text:
             self.view.search('')
             return self.search.search_done(False)

src/calibre/manual/customize.rst

@@ -8,16 +8,25 @@ Customizing |app|
 ==================================
 
 |app| has a highly modular design. Various parts of it can be customized. You can learn how to create
-*recipes* to add new sources of online content to |app| in the Section :ref:`news`. Here, you will learn how to
+*recipes* to add new sources of online content to |app| in the Section :ref:`news`. Here, you will learn,
-use *plugins* to customize and control various aspects of |app|'s behavior. 
+first, how to use environment variables and *tweaks* to customize |app|'s behavior and then how to
-
+use *plugins* to add funtionality to |app|.
-Theer are different kinds of plugins, corresponding to different aspects of |app|. As more and more aspects of |app|
-are modularized, new plugin types will be added.
 
 .. contents::
     :depth: 2
     :local:
 
+Environment variables
+-----------------------
+
+    * ``CALIBRE_CONFIG_DIRECTORY``
+    * ``CALIBRE_OVERRIDE_DATABASE_PATH``
+    * ``CALIBRE_DEVELOP_FROM``
+    * ``CALIBRE_OVERRIDE_LANG``
+    * ``SYSFS_PATH``
+    * ``http_proxy``
+
+
 A Hello World plugin
 ------------------------
 

src/calibre/web/feeds/recipes/model.py

@@ -241,7 +241,7 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser):
                 results.add(urn)
         return results
 
-    def search(self, query, refinement):
+    def search(self, query):
         try:
             results = self.parse(unicode(query))
             if not results: