mirror of
https://github.com/iiab/iiab.git
synced 2025-02-13 03:32:12 +00:00
Merge pull request #2646 from tim-moody/7.3.1-zim-cat
support our own zim files
This commit is contained in:
commit
aee5d0f02c
1 changed files with 3 additions and 4 deletions
|
@ -55,7 +55,7 @@ def get_zim_list(path):
|
|||
zim_versions[perma_ref] = zim_info # if there are multiples, last should win
|
||||
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
|
||||
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
|
||||
'''
|
||||
|
||||
kiwix_exclude_attr.append("id") # don't include id
|
||||
kiwix_exclude_attr.append("favicon") # don't include large favicon
|
||||
kiwix_exclude_attr.append("id") # don't include id because is key
|
||||
zims_installed = {}
|
||||
path_to_id_map = {}
|
||||
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
|
||||
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
|
||||
|
||||
|
|
Loading…
Reference in a new issue