Commit graph

220 commits

Author SHA1 Message Date
Pk11
c9d7092f3a Add mappings formats of a few strings
So translations can change the order of the variables
2020-10-20 10:08:40 -05:00
Jim Miller
31c5696cd1 Improve menus setVisible(False)--also disables. 2020-10-18 17:05:13 -05:00
Jim Miller
7c2fac6b7a Change from menus disable to setVisible(False). 2020-10-18 16:29:32 -05:00
Jim Miller
08cadaea10 Changes to always have all FFF shortcut/menu items present plus submenus. 2020-10-17 16:37:56 -05:00
Jim Miller
b2bb03921c Add status to AO3 series collection. 2020-10-01 13:28:20 -05:00
Jim Miller
a9c87f4ecf Add get_urls_from_page() and get_series_from_page() to adapters, add
support.
2020-09-24 13:43:02 -05:00
Jim Miller
12ac620d71 Fix anthology comments for changes in how Calibre handles them. 2020-09-04 20:55:37 -05:00
Jim Miller
d4d3226803 Fix for Anthology bug when no story has a series. 2020-08-30 17:04:45 -05:00
Jim Miller
f4b9431603 Add a 'shouldn't happen' error check for anthology merge. 2020-08-24 13:43:24 -05:00
Jim Miller
e5bd062c26 Show busy cursor during anthology merge & update. 2020-08-20 16:16:11 -05:00
Jim Miller
e1d087733f For anthologies, look for common val in numbered series00 if not all share 'series'. 2020-07-15 13:46:51 -05:00
Jim Miller
fe6e0263b8 Add 'Series [0]' option for new anthologies. 2020-07-15 12:12:51 -05:00
Jim Miller
3a23924721 Check for epub before polishing cover into it. 2020-06-17 17:15:33 -05:00
Jim Miller
54409dd083 Fix for collision issue with translations and email direct d/l. 2020-06-04 17:26:41 -05:00
Jim Miller
f59f1d0b37 Make sure all timestamps are using Calibre's local_tz. 2020-03-24 20:18:06 -05:00
Jim Miller
4b9bc818d7 Use storyUrl from metadata for checking library, for those sites that make canonical storyUrl difficult, like adapter_literotica. Closes #461 2020-01-17 19:46:49 -06:00
Jim Miller
bfc9c8b45c Make sure storyUrl has &->& and then change it back for Calibre. Matches how authorUrl is handled(in all_metadata). Closes #460 2020-01-09 13:46:44 -06:00
Eli Schwartz
18804a52cf py3: add various python-six fixes 2019-12-17 10:44:06 -06:00
Eli Schwartz
c054449328 py3: get rid of basestring 2019-12-17 10:44:06 -06:00
Eli Schwartz
93e93dee92 py3: fix unicode type 2019-12-17 10:44:06 -06:00
Eli Schwartz
4d1be812e8 python3: use the io module everywhere
Make the calibre plugin usage work on python3. Since FanFicFare does not
support python 2.5, make it work by using the modern idiom.

Essentially, six.StringIO and six.BytesIO makes no sense to use
anywhere, since any code that works on python3 at all will also work
with the io module in python >= 2.6. The only caveat is that the
unadorned str type in python2 works with neither, but it is always best
to be explicit and use either unicode or bytes.
2019-12-17 10:44:06 -06:00
Eli Schwartz
15a79ee0ca python3: decode the bytes received from get_resources()
We're combining it with a str type.
2019-12-17 10:44:06 -06:00
Eli Schwartz
dc77754c1a python3: use modern exception syntax 2019-12-17 10:44:06 -06:00
Jim Miller
816237116d Add to debug output to plugin. 2019-12-02 13:52:28 -06:00
Jim Miller
45e336b61e Add plugin option for toolbar button to pop menu. 2019-11-22 21:41:29 -06:00
Jim Miller
31182e18fc Closes #466 - Remove feature to save cookiejar between downloads and BG jobs--causes some obscure problems with QQ at least. 2019-11-17 11:36:07 -06:00
Jim Miller
96aeab1ddf Adding a little debug output. 2019-11-09 10:17:45 -06:00
Jim Miller
dff90a10df Discard cookie cache on library change--might use different users/settings. 2019-11-03 16:49:07 -06:00
Jim Miller
e9d313f4ab Save cookiejar between downloads during same calibre session, including BG jobs. 2019-10-26 11:16:46 -05:00
Jim Miller
defa942a29 Additional warnings about imaptags added to manually added story URLs. Plus confirm(show_cancel_button=False) where appropriate. 2019-10-01 20:10:28 -05:00
Jim Miller
fbf6a48020 Add feature to automatically add optional tags for stories downloaded from email URLs. 2019-09-12 10:37:12 -05:00
Jim Miller
cc6ccff2b4 Fix for reportorder results when not BG'ed. 2019-07-13 09:22:55 -05:00
Jim Miller
ac72c19676 Plugin: Group reported results better. 2019-07-12 21:54:05 -05:00
Jim Miller
46645c5b93 Change metadata separator to ' & ' when filling 'Contains names' custom columns. 2019-06-13 13:54:48 -05:00
Jim Miller
cbcfd32464 Fix for yet more arbitrary py3 changes breaking code. Fixes #400 2019-06-08 08:26:25 -05:00
Jim Miller
dffb4d3168 Add 'publisher' metadata as a copy of 'site' and use to fill Publisher in Calibre. 2019-05-16 14:54:33 -05:00
Jim Miller
7e80dacd92 Removing all filter()/map() calls--not consistent between Py2/Py3. 2019-05-14 13:12:54 -05:00
Eli Schwartz
c8362433e2 optimization: do not use filter just to get counts of a list
This breaks in python3, because filter returns an iterable filter
object, and it's anyways wrong on python2, because it does extra work to
create a list only to discard it. The best way to do this is to test
each member of the list and abort early as soon as we get the info we
need (that it is non-zero). Or alternatively use sum with a generator
expression.
2019-05-13 13:06:35 -05:00
Jim Miller
0bbe27b9e9 Fix for anthology titles (and generate cover settings) not needing encode() anymore. 2019-05-06 14:15:58 -05:00
Jim Miller
3e5de53984 More fixing for bool metadata values--convert to string when set. 2019-04-14 15:05:27 -05:00
Jim Miller
d423100e6b Update copyright. 2019-01-15 10:38:53 -06:00
Jim Miller
d1849d807c Ignore current Virtual Library when checking for existing story ID. 2019-01-09 12:21:15 -06:00
Jim Miller
e1adbcf128 Refactor busy_cursor, busy cursor around saving rejects & settings, bump copyright years. 2018-11-11 09:58:07 -06:00
Jim Miller
f86d7d39b8 Fix for problem with new collision code and rejected URL. 2018-10-18 13:27:27 -05:00
Jim Miller
8d39ad037e Fix for Calibre Metadata update called with URLs not in library. 2018-10-15 15:05:59 -05:00
Jim Miller
a660b8e023 Add fix calibre title/author cases options, move force title/author sort values to Standard Columns config Tab. 2018-09-27 14:06:39 -05:00
Jim Miller
6717fbfd89 Restore cursor in finally: clauses in case of issues. 2018-08-30 12:56:17 -05:00
Jim Miller
3661966a9b Calibre Plugin: Remove ebook formats before update, overwrite or unnew so that the previouis version ends up in trash instead of just copied over. 2018-06-22 18:02:35 -05:00
Jim Miller
4828a63e22 Clarify some tooltip text and add 'FFF Frozen URL' feature. 2018-05-24 12:31:51 -05:00
Jim Miller
d521cfdcf0 Consolidate URL chapter range code and apply to CLI for #302. 2018-05-08 15:27:42 -05:00
Jim Miller
1dde324b51 Calculate number of chapters using start-end range when doing updates. 2018-02-26 09:25:38 -06:00
Jim Miller
c492b73e99 Apply is_adult&user/pass dialogs to CALIBREONLY update. 2017-11-27 14:47:29 -06:00
Jim Miller
e453ade9cb Allow multiple range URLs (url[1-5]) for same story in one download. 2017-06-18 10:08:27 -05:00
Jim Miller
dddb771d79 Catch other common complete/in-progress statuses for calibre yes/no columns. 2017-05-15 19:32:47 -05:00
Jim Miller
ca5036792f Let PI search inside zip(html) and txt formats for story URLs. 2017-05-09 11:45:38 -05:00
Jim Miller
1d2a00feab Remove debug output of dependency versions. 2017-05-07 13:26:27 -05:00
Jim Miller
f4da821ab8 Fix error with std_cols_newonly if user has never saved config. 2017-05-05 18:53:06 -05:00
Jim Miller
118360102d Debug output of depend package versions. 2017-04-29 20:01:17 -05:00
Jim Miller
273ca6bcd7 Fix for PI suppressauthorsort/suppresstitlesort interacting wrong with Author/Title New Only. 2017-04-28 17:57:40 -05:00
Jim Miller
228b94592e Refactor to move fetches to Configuration class plus test version bump. 2017-03-29 18:28:49 -05:00
Jim Miller
b52d493e2a Fix for authors and New Only. 2017-03-11 11:25:45 -06:00
Jim Miller
5cd4f23011 Normalize anthology URLs both from page and from epub. 2017-02-14 13:46:57 -06:00
Yuri Chornoivan
8cf5f1b401 Fix minor typos 2017-01-27 09:27:27 +02:00
Jim Miller
6868fd4e5f Fix for error column when not an error. 2017-01-25 10:29:47 -06:00
Jim Miller
fea4cef885 Edge case fixes for errorcol and lastcheckedcol. 2017-01-14 15:37:20 -06:00
Jim Miller
96c8a75892 Change comments sanitization for calibre to be less draconic. 2016-11-04 20:33:16 -05:00
Jim Miller
dcb607892e Rename lasttouch to lastchecked. 2016-10-28 22:55:56 -05:00
Jim Miller
5431cfc59b Adding Last Touch Column feature, bump test version. 2016-10-28 13:52:15 -05:00
Jim Miller
51542d4e31 Add 'Reject w/o Confirm' option for Series Anthology Check. 2016-09-18 19:33:01 -05:00
Jim Miller
d4291f2cd6 Adding Update Existing Only option to Email URL Fetch. 2016-09-08 10:50:01 -05:00
Jim Miller
d0e4999712 Force overall cover for Anthologies if any sub-books have covers to avoid Calibre Polish issues. 2016-08-20 14:05:36 -05:00
Jim Miller
1887cf2cb9 Fix for Publisher and Language metadata for Anthologies. 2016-08-14 11:22:32 -05:00
Jim Miller
93712de4b7 Add options for controlling Anthology book comments on the Standard Columns config tab. (plugin only) 2016-08-12 21:40:55 -05:00
Jim Miller
288f12afed Add n_anthaver and r_anthaver modes to custom_columns_settings for averaging metadata for anthologies before setting in integer and float calibre custom columns. 2016-07-12 14:53:18 -05:00
cryzed
315536a75b Fix for #120 2016-05-21 16:45:05 +02:00
Jim Miller
1c4250c0c1 Add merged tags to anthology epubs. 2016-05-19 09:27:19 -05:00
Jim Miller
664fb639bd Unique name for ViewLog size. 2016-05-09 12:28:18 -05:00
Jim Miller
6b3a19bb45 Remove some more prints in the hopes it will help Mac. 2016-04-20 16:33:55 -05:00
Jim Miller
0161991c2a Fix for Overwrite if Newer not working with BG Metadata. 2016-04-03 13:06:34 -05:00
Jim Miller
bffc389bcf Add 'Save All Errors' checkbox for plugin save-errors column. 2016-03-22 22:01:51 -05:00
Jim Miller
6de973fe2d Add additional strings for translations. 2016-03-21 20:24:03 -05:00
Jim Miller
572f4e4c7f Adding [storyUrl] ini sections feature for custom config for individual stories. 2016-02-26 10:30:02 -06:00
Jim Miller
f090485369 Show download count in Jobs list. 2016-02-14 10:18:03 -06:00
Jim Miller
3dd6550882 Fetch updated 'mi' from DB before generating covers. 2016-02-09 10:34:09 -06:00
Jim Miller
784375d15e Adding Word Count post-processing option, like Smarten Punct. 2016-01-29 22:34:07 -06:00
Jim Miller
13e5615dea Skip (instead of error) if asked to UnNew non-FFF epubs. 2015-12-28 09:44:41 -06:00
Jim Miller
3ecd5ecc39 Set FimF adult cookie for 'get urls from page' 2015-11-25 10:50:14 -06:00
Jim Miller
49b9994a3b Fix for issue with Email fetch using last used Add options instead of default Add options. 2015-10-15 13:18:43 -05:00
Jim Miller
df9065b1ba Improve handling for authors without authorUrl (mostly for teststory). 2015-10-09 11:25:39 -05:00
Jim Miller
be04eed180 Add Background Metadata feature for updates. 2015-09-30 10:28:11 -05:00
Jim Miller
10d297d77f Change plugin to deal adapters that can change story URL due to being given chapter url. 2015-09-09 08:44:57 -05:00
Jim Miller
ddc957d1b7 Explicitly set publisher=None to avoid occasional problems. 2015-08-29 08:30:37 -05:00
Jim Miller
49c899df5d Add chapter range to title if used. Can be disabled in ini. 2015-07-29 08:42:44 -05:00
Jim Miller
2b0d2fc5c1 Add 'Download from Email Immediately' optional feature to plugin. 2015-07-23 08:19:41 -05:00
Jim Miller
26e54b3fcb Remove unneeded vim & #! comments. 2015-07-10 10:55:46 -05:00
Jim Miller
d065ae56d2 Make UnNew on 'mark read' optional, add '--unnew' option to CLI. 2015-07-10 10:40:17 -05:00
Jim Miller
e3c5d97e5e Merge branch 'master' into spacebattles 2015-07-07 23:19:04 -05:00
Jim Miller
4f7fd93b64 Make searching for existing books by title/author(s) optional. 2015-07-07 23:18:46 -05:00
Jim Miller
e637b4b073 Save first version of UnNew feature for removing '(new)' marks on chapters. 2015-07-03 11:16:47 -05:00
Jim Miller
17b0800242 Add feature - make it optional to set the Calibre Author URL (on Standard Columns tab) 2015-06-26 12:46:14 -05:00
Jim Miller
78e5d8427b Make passing Calibre Columns in optional and only pass savemetacol data when column is configured to reduce data passed to/from BG processes. 2015-06-12 19:39:30 -05:00
Jim Miller
2a174f1762 Normalize story URLs from email before comparing to Reject List. 2015-05-30 16:23:12 -05:00
Jim Miller
e81e2655fc Merge remote-tracking branch '2FanFicFare/master' into metadata 2015-05-18 12:01:57 -05:00
Jim Miller
8d517ccf27 Fix for Reject always on Fetch from Email. 2015-05-18 12:01:12 -05:00
Jim Miller
a80b9d1114 Merge remote-tracking branch '2FanFicFare/master' into metadata 2015-05-15 17:47:16 -05:00
Jim Miller
9fb3c72d3f Polish Series/Anthology update, busy cursor. 2015-05-15 17:46:54 -05:00
Jim Miller
5b57571367 Fix and Tweak Saved Metadata and Calibre Metadata-into-ebooks features. 2015-05-15 11:49:46 -05:00
Jim Miller
aaf366f22a Merge remote-tracking branch '2FanFicFare/master' into metadata 2015-05-14 22:52:39 -05:00
Jim Miller
e5edb7b945 Polish Fetch from Page, busy cursor. 2015-05-14 22:52:33 -05:00
Jim Miller
d9b5b4bfe3 Merge remote-tracking branch '2FanFicFare/master' into metadata 2015-05-14 22:16:06 -05:00
Jim Miller
beef2ebadc Polish Fetch from Email, add auto-reject feature. 2015-05-14 22:15:30 -05:00
Jim Miller
44e3d07195 Tweak metadata save/reuse. 2015-05-13 12:59:42 -05:00
Jim Miller
ef52acd5b3 Save and use metadata from a custom column, and pass cal cols into fff on updates. 2015-05-08 16:36:08 -05:00
Jim Miller
d93e4a152d Remove metadata saved in epub code, keep stubs for metadata saved elsewhere. Calibre User Categories into metadata isn't working right. 2015-05-05 17:33:59 -05:00
Jim Miller
52487456d7 Save more partial code for metadata saved in epubs and existing cal columns passed into update. Epub metadata version. 2015-05-05 16:13:27 -05:00
Jim Miller
41cf8dff09 Save partial code for metadata saved in epubs and existing cal columns passed into update. 2015-04-29 10:54:57 -05:00
Jim Miller
138b751519 Enhance Cover Generation settings, including option to use Cal's built-in cover gen. 2015-04-23 20:07:34 -05:00
Jim Miller
04e0bde07b Update PI about box. 2015-04-16 13:30:13 -05:00
Jim Miller
be1f541da9 Change some menu & gui details to be clearer, more renaming. 2015-04-11 11:10:27 -05:00
Jim Miller
6b36cb29b9 Additional Renaming from FFDL to FFF, plugin copyright/LICENSE updates. 2015-04-08 17:28:25 -05:00
Renamed from calibre-plugin/ffdl_plugin.py (Browse further)