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

Content server: When updating interface data do not transmit translations if they have not been changed. Saves ~30-60KB bandwidth when using non-English interface language.

Browse Source
This commit is contained in:
Kovid Goyal 2018-03-24 10:50:24 +05:30
parent a26292751d
commit baee2d2546
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup/translations.py
View File

@ -294,7 +294,8 @@ class Translations(POT): # {{{
base = os.path.dirname(dest)
if not os.path.exists(base):
os.makedirs(base)
data, current_hash = self.hash_and_data(src)
data, h = self.hash_and_data(src)
current_hash = h.digest()
saved_hash, saved_data = self.read_cache(src)
if current_hash == saved_hash:
with open(dest, 'wb') as d:
@ -384,7 +385,7 @@ class Translations(POT): # {{{
data = s.read()
h = hashlib.sha1(data)
h.update(f.encode('utf-8'))
return data, h.digest()
return data, h
def compile_content_server_translations(self):
self.info('Compiling content-server translations')
@ -392,7 +393,8 @@ class Translations(POT): # {{{
from calibre.utils.zipfile import ZipFile, ZIP_DEFLATED, ZipInfo, ZIP_STORED
with ZipFile(self.j(self.RESOURCES, 'content-server', 'locales.zip'), 'w', ZIP_DEFLATED) as zf:
for src in glob.glob(os.path.join(self.TRANSLATIONS, 'content-server', '*.po')):
data, current_hash = self.hash_and_data(src)
data, h = self.hash_and_data(src)
current_hash = h.digest()
saved_hash, saved_data = self.read_cache(src)
if current_hash == saved_hash:
raw = saved_data
@ -402,7 +404,8 @@ class Translations(POT): # {{{
po_data = data.decode('utf-8')
data = json.loads(msgfmt(po_data))
translated_entries = {k:v for k, v in data['entries'].iteritems() if v and sum(map(len, v))}
data['entries'] = translated_entries
data[u'entries'] = translated_entries
data[u'hash'] = h.hexdigest()
cdata = b'{}'
if translated_entries:
raw = json.dumps(data, ensure_ascii=False, sort_keys=True)

10
src/calibre/srv/code.py
View File

@ -154,12 +154,16 @@ def basic_interface_data(ctx, rd):
return ans
@endpoint('/interface-data/update', postprocess=json)
def update_interface_data(ctx, rd):
@endpoint('/interface-data/update/{translations_hash=None}', postprocess=json)
def update_interface_data(ctx, rd, translations_hash):
'''
Return the interface data needed for the server UI
'''
return basic_interface_data(ctx, rd)
ans = basic_interface_data(ctx, rd)
t = ans['translations']
if t and (t.get('hash') or translations_hash) and t.get('hash') == translations_hash:
del ans['translations']
return ans
def get_field_list(db):

7
src/pyj/book_list/main.pyj
View File

@ -122,7 +122,12 @@ def load_interface_data():
def do_update_interface_data():
ajax('interface-data/update', def (end_type, xhr, ev):
t = get_translations()
thash = t?.hash
url = 'interface-data/update'
if thash:
url += '/' + thash
ajax(url, def (end_type, xhr, ev):
if end_type is 'load':
data = JSON.parse(xhr.responseText)
update_interface_data(data)