diff --git a/resources/images/tb_folder.png b/resources/images/tb_folder.png new file mode 100644 index 0000000000..014529be3d Binary files /dev/null and b/resources/images/tb_folder.png differ 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 diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 385849ae79..09c755ab5e 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -2371,7 +2371,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: