Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cant use polyglot in plugins_mirror

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-25 17:54:42 +05:30
parent 5918acabad
commit 6d3fcc853e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup/plugins_mirror.py
View File

@ -33,7 +33,6 @@ from email.utils import parsedate
from functools import partial from functools import partial
from multiprocessing.pool import ThreadPool from multiprocessing.pool import ThreadPool
from xml.sax.saxutils import escape, quoteattr from xml.sax.saxutils import escape, quoteattr
from polyglot.builtins import iteritems, itervalues
# }}} # }}}
USER_AGENT = 'calibre mirror' USER_AGENT = 'calibre mirror'
@ -293,7 +292,7 @@ def get_plugin_info(raw, check_for_qt5=False):
metadata = names[inits[0]] metadata = names[inits[0]]
else: else:
# Legacy plugin # Legacy plugin
for name, val in iteritems(names): for name, val in names.items():
if name.endswith('plugin.py'): if name.endswith('plugin.py'):
metadata = val metadata = val
break break
@ -332,7 +331,7 @@ def update_plugin_from_entry(plugin, entry):
def fetch_plugin(old_index, entry): def fetch_plugin(old_index, entry):
lm_map = {plugin['thread_id']:plugin for plugin in itervalues(old_index)} lm_map = {plugin['thread_id']:plugin for plugin in old_index.values()}
raw = read(entry.url) raw = read(entry.url)
url, name = parse_plugin_zip_url(raw) url, name = parse_plugin_zip_url(raw)
if url is None: if url is None:
@ -404,7 +403,7 @@ def fetch_plugins(old_index):
log('Failed to get plugin', entry.name, 'at', datetime.utcnow().isoformat(), 'with error:') log('Failed to get plugin', entry.name, 'at', datetime.utcnow().isoformat(), 'with error:')
log(plugin) log(plugin)
# Move staged files # Move staged files
for plugin in itervalues(ans): for plugin in ans.values():
if plugin['file'].startswith('staging_'): if plugin['file'].startswith('staging_'):
src = plugin['file'] src = plugin['file']
plugin['file'] = src.partition('_')[-1] plugin['file'] = src.partition('_')[-1]
@ -412,7 +411,7 @@ def fetch_plugins(old_index):
raw = bz2.compress(json.dumps(ans, sort_keys=True, indent=4, separators=(',', ': '))) raw = bz2.compress(json.dumps(ans, sort_keys=True, indent=4, separators=(',', ': ')))
atomic_write(raw, PLUGINS) atomic_write(raw, PLUGINS)
# Cleanup any extra .zip files # Cleanup any extra .zip files
all_plugin_files = {p['file'] for p in itervalues(ans)} all_plugin_files = {p['file'] for p in ans.values()}
extra = set(glob.glob('*.zip')) - all_plugin_files extra = set(glob.glob('*.zip')) - all_plugin_files
for x in extra: for x in extra:
os.unlink(x) os.unlink(x)
@ -499,7 +498,7 @@ h1 { text-align: center }
name, count = x name, count = x
return '<tr><td>%s</td><td>%s</td></tr>\n' % (escape(name), count) return '<tr><td>%s</td><td>%s</td></tr>\n' % (escape(name), count)
pstats = map(plugin_stats, sorted(iteritems(stats), reverse=True, key=lambda x:x[1])) pstats = map(plugin_stats, sorted(stats.items(), reverse=True, key=lambda x:x[1]))
stats = '''\ stats = '''\
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>