Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-05 19:11:50 +02:00
Code Issues Projects Releases Wiki Activity

Closes #466 - Remove feature to save cookiejar between downloads and BG jobs--causes some obscure problems with QQ at least.

Browse source
This commit is contained in:
Jim Miller 2019-11-17 11:35:19 -06:00
parent 333444371c
commit 31182e18fc
2 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
calibre-plugin/fff_plugin.py
View file

@ -184,7 +184,6 @@ class FanFicFarePlugin(InterfaceAction):
self.menu.aboutToShow.connect(self.about_to_show_menu)
self.imap_pass = None
self.cookiejar = None
def initialization_complete(self):
# otherwise configured hot keys won't work until the menu's
@ -283,8 +282,6 @@ class FanFicFarePlugin(InterfaceAction):
self.rebuild_menus()
rejecturllist.clear_cache()
self.imap_pass = None
del self.cookiejar
self.cookiejar = None
def rebuild_menus(self):
with self.menus_lock:
@ -1114,21 +1111,9 @@ class FanFicFarePlugin(InterfaceAction):
if 'pagecache' not in options:
options['pagecache'] = configuration.get_empty_pagecache()
configuration.set_pagecache(options['pagecache'])
# keep cookiejar in memory to share between download sessions
# erased when calibre restared.
# if self.cookiejar_file is not None:
# logger.debug("self.cookiejar_file:%s"%self.cookiejar_file.name)
if self.cookiejar is None:
self.cookiejar = options['cookiejar'] = configuration.get_empty_cookiejar()
# ## forces to save
# self.cookiejar_file = PersistentTemporaryFile(suffix='.fanficfare.cookiejar')
# logger.debug("self.cookiejar_file:"+self.cookiejar_file.name)
if 'cookiejar' not in options:
options['cookiejar'] = self.cookiejar
options['cookiejar'] = configuration.get_empty_cookiejar()
configuration.set_cookiejar(options['cookiejar'])
#,self.cookiejar_file.name)
if collision in (CALIBREONLY, CALIBREONLYSAVECOL):
## Getting metadata from configured column.
@ -1695,14 +1680,6 @@ class FanFicFarePlugin(InterfaceAction):
self.gui.iactions['Convert Books'].auto_convert_auto_add(all_not_calonly_ids)
def download_list_completed(self, job, options={},merge=False):
## merge in cookies from bg procs.
logger.debug("Loading cookiejar from BG?")
if self.cookiejar is not None and 'cookiejarfile' in options:
logger.debug("Loading cookiejar from BG:"+options['cookiejarfile'])
self.cookiejar.load(options['cookiejarfile'],
ignore_discard=True,
ignore_expires=True)
logger.debug("Loaded cookiejar from BG.")
if job.failed:
self.gui.job_exception(job, dialog_title='Failed to Download Stories')
return

4
calibre-plugin/jobs.py
View file

@ -187,10 +187,6 @@ def do_download_for_worker(book,options,merge,notification=lambda x,y:x):
adapter.setChaptersRange(book['begin'],book['end'])
configuration.load_cookiejar(options['cookiejarfile'])
## set_cookiejar(,jarfile) also sets up configuration to
## save cookies.
configuration.set_cookiejar(configuration.get_cookiejar(),
options['cookiejarfile'])
#logger.debug("cookiejar:%s"%configuration.cookiejar)
configuration.set_pagecache(options['pagecache'])