Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2025-12-06 08:52:55 +01:00
Code Issues Projects Releases Wiki Activity

Make plugin use own copy of six only.

Browse source
This commit is contained in:
Jim Miller 2025-02-05 17:07:59 -06:00
parent a9533364ec
commit 35e0ada643
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
calibre-plugin/common_utils.py
View file

@ -2,7 +2,6 @@
from __future__ import (unicode_literals, division, absolute_import,
print_function)
import fanficfare.six as six
__license__ = 'GPL v3'
__copyright__ = '2011, Grant Drake <grant.drake@gmail.com>, 2018, Jim Miller'
@ -22,7 +21,9 @@ from calibre.gui2.actions import menu_action_unique_name
from calibre.gui2.keyboard import ShortcutConfig
from calibre.utils.config import config_dir
from calibre.utils.date import now, format_date, qt_to_dt, UNDEFINED_DATE
from fanficfare.six import text_type as unicode
import fanficfare.six as six
from six import text_type as unicode
# Global definition of our plugin name. Used for common functions that require this.
plugin_name = None

4
calibre-plugin/config.py
View file

@ -2,7 +2,6 @@
from __future__ import (unicode_literals, division, absolute_import,
print_function)
import fanficfare.six as six
__license__ = 'GPL v3'
__copyright__ = '2021, Jim Miller'
@ -24,7 +23,8 @@ from PyQt5.Qt import (QWidget, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel,
from calibre.gui2 import dynamic, info_dialog
from calibre.gui2.complete2 import EditWithComplete
from calibre.gui2.dialogs.confirm_delete import confirm
from fanficfare.six import text_type as unicode
import fanficfare.six as six
from six import text_type as unicode
try:
from calibre.ebooks.covers import generate_cover as cal_generate_cover

7
calibre-plugin/fff_plugin.py
View file

@ -2,14 +2,13 @@
from __future__ import (unicode_literals, division, absolute_import,
print_function)
import fanficfare.six as six
from six.moves import range
__license__ = 'GPL v3'
__copyright__ = '2021, Jim Miller'
__docformat__ = 'restructuredtext en'
from fanficfare.six import ensure_text, string_types, text_type as unicode
import fanficfare.six as six
from six import ensure_text, string_types, text_type as unicode
# import cProfile
@ -1243,7 +1242,7 @@ class FanFicFarePlugin(InterfaceAction):
url = adapter.url
## three tries, that's enough if both user/pass & is_adult needed,
## or a couple tries of one or the other
for x in range(0,2):
for x in [0,1,2]:
try:
adapter.getStoryMetadataOnly(get_cover=False)
except exceptions.FailedToLogin as f:

4
calibre-plugin/jobs.py
View file

@ -2,7 +2,6 @@
from __future__ import (unicode_literals, division, absolute_import,
print_function)
import fanficfare.six as six
__license__ = 'GPL v3'
__copyright__ = '2020, Jim Miller, 2011, Grant Drake <grant.drake@gmail.com>'
@ -459,7 +458,8 @@ def inject_cal_cols(book,story,configuration):
if 'calibre_columns' in book:
injectini = ['[injected]']
extra_valid = []
for k, v in six.iteritems(book['calibre_columns']):
for k in book['calibre_columns'].keys():
v = book['calibre_columns'][k]
story.setMetadata(k,v['val'])
injectini.append('%s_label:%s'%(k,v['label']))
extra_valid.append(k)