From 7324d989d07fe0b841f5c6f677273da1056443e0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Feb 2011 09:25:52 -0700 Subject: [PATCH 1/3] ... --- resources/recipes/ming_pao.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/recipes/ming_pao.recipe b/resources/recipes/ming_pao.recipe index 9febcec0e5..bbdbbf7ace 100644 --- a/resources/recipes/ming_pao.recipe +++ b/resources/recipes/ming_pao.recipe @@ -31,7 +31,9 @@ class MPHKRecipe(BasicNewsRecipe): oldest_article = 1 max_articles_per_feed = 100 __author__ = 'Eddie Lau' - description = 'Hong Kong Chinese Newspaper (http://news.mingpao.com)' + description = ('Hong Kong Chinese Newspaper (http://news.mingpao.com). If' + 'you are using a Kindle with firmware < 3.1, customize the' + 'recipe') publisher = 'MingPao' category = 'Chinese, News, Hong Kong' remove_javascript = True From bb01af94624a931c666e6ce82cf3a886529b2318 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Feb 2011 13:56:39 -0700 Subject: [PATCH 2/3] ... --- src/calibre/library/database2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 305d1581d7..bd89e12044 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -2356,7 +2356,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): rating = int(rating) self.conn.execute('DELETE FROM books_ratings_link WHERE book=?',(id,)) rat = self.conn.get('SELECT id FROM ratings WHERE rating=?', (rating,), all=False) - rat = rat if rat else self.conn.execute('INSERT INTO ratings(rating) VALUES (?)', (rating,)).lastrowid + rat = rat if rat is not None else self.conn.execute('INSERT INTO ratings(rating) VALUES (?)', (rating,)).lastrowid self.conn.execute('INSERT INTO books_ratings_link(book, rating) VALUES (?,?)', (id, rat)) self.dirtied([id], commit=False) if commit: From 750d63d1820556a13615a0001c45fccae031a773 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Feb 2011 14:31:26 -0700 Subject: [PATCH 3/3] New image for user categories --- resources/images/tb_folder.png | Bin 0 -> 6476 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/tb_folder.png diff --git a/resources/images/tb_folder.png b/resources/images/tb_folder.png new file mode 100644 index 0000000000000000000000000000000000000000..014529be3db5e6f7ddeb0ff8b36d2ce74f906509 GIT binary patch literal 6476 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