31714 Commits

Author SHA1 Message Date
Kovid Goyal
1c0f8a4c02 Merge branch 'master' of https://github.com/cbhaley/calibre 2015-11-24 09:14:29 +05:30
Charles Haley
6c2f86b7b7 Fix crash when books in GST don't have ratings 2015-11-23 18:49:20 +01:00
Kovid Goyal
6eb304c3be Fix a bug in the counting of ratings from legacy databases 2015-11-23 21:22:54 +05:30
Kovid Goyal
4c425353bf ... 2015-11-23 21:15:43 +05:30
Kovid Goyal
d33db7bc37 Merge branch 'master' of https://github.com/cbhaley/calibre 2015-11-23 21:13:52 +05:30
Charles Haley
8ff0bf8481 Fix counting items. The old way misstated the counts for user categories because it was using the cumulative id_set from the original category. 2015-11-23 16:21:27 +01:00
Charles Haley
99adf52046 Cache the computed average rating 2015-11-23 16:21:11 +01:00
Charles Haley
b4efa96292 Only put a node into intermediate_nodes if it is involved in a hierarchy 2015-11-23 16:20:53 +01:00
Charles Haley
4aa32c8e4d Fix GSTs to show the source categories of the items consolidated into the name, and to correct the average rating during consolidation 2015-11-23 16:20:05 +01:00
Kovid Goyal
e8f62e0e49 Add file type icons to icon map 2015-11-23 20:47:32 +05:30
Kovid Goyal
455ab662e2 ... 2015-11-23 20:38:01 +05:30
Kovid Goyal
ac0994da7d ... 2015-11-23 20:33:52 +05:30
Kovid Goyal
cd57f42705 Add icon map to JSON Tag browser 2015-11-23 20:32:52 +05:30
Kovid Goyal
7a3261d86b ... 2015-11-23 18:22:29 +05:30
Kovid Goyal
568163c5f7 Do not store icons in get_categories() 2015-11-23 18:22:24 +05:30
Kovid Goyal
ebddee8f59 Cache the rendered Tag Browser rather than the result of get_categories() in the server
get_categories() now has its own independent cache which is used by the
old AJAX API kept around for backwards compatibility.
2015-11-23 17:09:41 +05:30
Kovid Goyal
87b4e0906b Tag browser: Fix book counts for hierarchical items incorrect in user categories 2015-11-23 16:39:06 +05:30
Kovid Goyal
68790624fe Calculate correct avg_rating for JSON rep as well 2015-11-23 15:39:37 +05:30
Kovid Goyal
502193eb24 ... 2015-11-23 15:33:03 +05:30
Kovid Goyal
4f51fc439e Implement intermediate_nodes for the JSON tag browser as well 2015-11-23 15:07:33 +05:30
Kovid Goyal
17edcc0686 Put back intermediate_nodes
With the changes to avg_rating it works ok
2015-11-23 14:58:14 +05:30
Kovid Goyal
9b229f3951 Show search expression in tooltip for saved search entries in tag browser 2015-11-23 13:13:39 +05:30
Kovid Goyal
b4f84a8fb4 Show correct values for average rating of hierarchical items in the Tag Browser 2015-11-23 12:54:57 +05:30
Kovid Goyal
9f9655d812 Do not create tooltips in get_categories()
Tooltips should be generated on demand by the UI
2015-11-23 12:32:37 +05:30
Kovid Goyal
e9a1bc0e55 Get rid of intermediate_nodes as it seems to not be the right approach
Finding the right approach will require some careful thought/discussion
2015-11-23 10:28:56 +05:30
Kovid Goyal
e4f934b8b9 Fix tag id_set being modified when serializing to JSON 2015-11-23 09:27:26 +05:30
Kovid Goyal
4b7ed56566 Output rating when dumping tag trees 2015-11-23 00:48:59 +05:30
Kovid Goyal
039a582b96 ... 2015-11-23 00:46:35 +05:30
Kovid Goyal
7489f1a793 PDF Output: Handle input documents with fonts that do not have either postscript or full name information. Fixes #1518678 [ebook-convert failing on file with embedded font](https://bugs.launchpad.net/calibre/+bug/1518678) 2015-11-22 17:21:16 +05:30
Kovid Goyal
385fcfbba6 ... 2015-11-22 11:42:53 +05:30
Kovid Goyal
d522770230 Fix counting for hierarchical user categories 2015-11-22 11:42:24 +05:30
Kovid Goyal
d63837f814 Implement hidden categories in the server tag browser 2015-11-22 11:28:09 +05:30
Kovid Goyal
96ba7178cb Match prefs when comapring tag browsers 2015-11-22 11:17:17 +05:30
Kovid Goyal
2193d50e65 Fix counting for collapse nodes 2015-11-22 11:07:35 +05:30
Kovid Goyal
491cd2478c Compare output of GUI and server tag browsers 2015-11-22 10:57:35 +05:30
Kovid Goyal
3387169dca Allow overriding prefs used when constructing tags model 2015-11-22 10:42:21 +05:30
Kovid Goyal
b9e071e72b Add a convenient way to display string diffs 2015-11-22 10:41:46 +05:30
Kovid Goyal
e6380faa01 Start work on generating JSON representation of Tag Browser tree 2015-11-22 10:23:02 +05:30
Kovid Goyal
b44951a46c Do not run the post-installer through a shell 2015-11-22 07:31:02 +05:30
Kovid Goyal
27e4bd5b81 Simplify the main() function 2015-11-22 07:25:27 +05:30
Kovid Goyal
bea78ce197 Merge branch 'master' of https://github.com/cbhaley/calibre 2015-11-21 20:40:42 +05:30
Charles Haley
08dffd890f Recover the memory used to process intermediate nodes. 2015-11-21 15:12:07 +01:00
Charles Haley
09c43ac86d Reuse the node information (not the nodes themselves) for generated hierarchical nodes so that search indications show everywhere the node appears. 2015-11-21 15:10:24 +01:00
Charles Haley
3fe3e66880 Build the node tree in the tag browser in the necessary order (user categories last), then hide and reorder the tree as needed. 2015-11-21 11:29:08 +01:00
Kovid Goyal
c68b9b7d64 Update Amazon metadata download plugin to handle amazon.com website change that was preventing any metadata from being downloaded
Fixes a bug in the default html5lib lxml treebuilder that caused it to
fail on pages that have comments with -- or trailing hyphens.
2015-11-21 13:32:21 +05:30
Kovid Goyal
9a9e5d5d7b Allow USBMS sub-classes to override delete extra book files behavior easily 2015-11-21 10:02:42 +05:30
Kovid Goyal
e150b9f159 Edit Book: Fix error when trying to add words to user dictionary for a book with a language that has no dictionary available. Fixes #1517928 [problem with spellchecker](https://bugs.launchpad.net/calibre/+bug/1517928) [problem with spellchecker](https://bugs.launchpad.net/calibre/+bug/1517928) 2015-11-20 10:07:16 +05:30
Kovid Goyal
45e732332d Merge branch 'master' of https://github.com/JimmXinu/calibre 2015-11-20 09:53:17 +05:30
Jim Miller
052351795a sanitize_html shouldn't error when handed an empty string. 2015-11-19 13:02:39 -06:00
Kovid Goyal
069e77b9b9 Remove no longer working recipes 2015-11-19 08:13:47 +05:30