1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-15 04:32:11 +00:00

Merge pull request #2646 from tim-moody/7.3.1-zim-cat

support our own zim files
This commit is contained in:
Tim Moody 2020-11-25 09:23:09 -05:00 committed by GitHub
commit aee5d0f02c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -55,7 +55,7 @@ def get_zim_list(path):
zim_versions[perma_ref] = zim_info # if there are multiples, last should win zim_versions[perma_ref] = zim_info # if there are multiples, last should win
return files_processed, zim_versions return files_processed, zim_versions
def read_library_xml(lib_xml_file, kiwix_exclude_attr=[""]): # duplicated from iiab-cmdsrv def read_library_xml(lib_xml_file, kiwix_exclude_attr=["favicon"]): # duplicated from iiab-cmdsrv but changed
''' '''
Read zim properties from library.xml Read zim properties from library.xml
Returns dict of library.xml and map of zim id to zim file name (under <dev>/library/zims) Returns dict of library.xml and map of zim id to zim file name (under <dev>/library/zims)
@ -69,8 +69,7 @@ def read_library_xml(lib_xml_file, kiwix_exclude_attr=[""]): # duplicated from i
path_to_id_map (dict): A dictionary that translates zim ids to physical names path_to_id_map (dict): A dictionary that translates zim ids to physical names
''' '''
kiwix_exclude_attr.append("id") # don't include id kiwix_exclude_attr.append("id") # don't include id because is key
kiwix_exclude_attr.append("favicon") # don't include large favicon
zims_installed = {} zims_installed = {}
path_to_id_map = {} path_to_id_map = {}
try: try:
@ -108,7 +107,7 @@ def rem_libr_xml(zim_id, kiwix_library_xml):
if e.returncode != 2: # skip bogus file open error in kiwix-manage if e.returncode != 2: # skip bogus file open error in kiwix-manage
print(outp) print(outp)
def add_libr_xml(kiwix_library_xml, zim_path, zimname, zimidx): def add_libr_xml(kiwix_library_xml, zim_path, zimname, zimidx=None):
''' '''
Add a zim to library.xml Add a zim to library.xml