NussNougate/nhentai
4
0
Fork 0
mirror of https://github.com/RicterZ/nhentai.git synced 2025-11-04 11:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Alocks
2019-12-07 12:58:59 -03:00
parent ff8af8279f e1556b09cc
commit 75b00fc523
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nhentai/serializer.py
View File

@@ -22,7 +22,7 @@ def serialize(doujinshi, dir):
metadata['category'] = doujinshi.info.categories metadata['category'] = doujinshi.info.categories
metadata['URL'] = doujinshi.url metadata['URL'] = doujinshi.url
metadata['Pages'] = doujinshi.pages metadata['Pages'] = doujinshi.pages
with open(os.path.join(dir, 'metadata.json'), 'w') as f: with open(os.path.join(dir, 'metadata.json'), 'w', encoding="raw_unicode_escape") as f:
json.dump(metadata, f, separators=','':') json.dump(metadata, f, separators=','':')
@@ -32,13 +32,15 @@ def merge_json():
os.chdir(output_dir) os.chdir(output_dir)
doujinshi_dirs = next(os.walk('.'))[1] doujinshi_dirs = next(os.walk('.'))[1]
for folder in doujinshi_dirs: for folder in doujinshi_dirs:
folder_json = ',"Folder":"' + folder + '"}'
files = os.listdir(folder) files = os.listdir(folder)
if 'metadata.json' not in files: if 'metadata.json' not in files:
continue continue
data_folder = output_dir + folder + '/' + 'metadata.json' data_folder = output_dir + folder + '/' + 'metadata.json'
json_file = open(data_folder, encoding='raw_unicode_escape').read()[:-2]+folder_json json_file = open(data_folder, 'r')
lst.append(json.loads(json_file.encode('raw_unicode_escape').decode())) json_dict = {}
json_dict = json.load(json_file)
json_dict['Folder'] = folder
lst.append(json_dict)
return lst return lst
@@ -50,15 +52,15 @@ def serialize_unique(lst):
artist = [] artist = []
group = [] group = []
for dic in lst: for dic in lst:
if dic['parody']: if 'parody' in dic:
parody.extend([i for i in dic['parody']]) parody.extend([i for i in dic['parody']])
if dic['character']: if 'character' in dic:
character.extend([i for i in dic['character']]) character.extend([i for i in dic['character']])
if dic['tag']: if 'tag' in dic:
tag.extend([i for i in dic['tag']]) tag.extend([i for i in dic['tag']])
if dic['artist']: if 'artist' in dic:
artist.extend([i for i in dic['artist']]) artist.extend([i for i in dic['artist']])
if dic['group']: if 'group' in dic:
group.extend([i for i in dic['group']]) group.extend([i for i in dic['group']])
dictionary['parody'] = list(set(parody)) dictionary['parody'] = list(set(parody))
dictionary['character'] = list(set(character)) dictionary['character'] = list(set(character))