From 5f20f61fc50df8ddb7dc78a6322330ee5386d632 Mon Sep 17 00:00:00 2001
From: jnozsc <470215+jnozsc@users.noreply.github.com>
Date: Sat, 25 Jul 2020 14:39:01 -0700
Subject: [PATCH] one more fix on #261
---
core.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core.py b/core.py
index 1a13ec2..fe1e150 100755
--- a/core.py
+++ b/core.py
@@ -168,7 +168,8 @@ def get_info(json_data): # 返回json里的数据
cover = json_data['cover']
website = json_data['website']
series = json_data['series']
- return title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series
+ label = json_data.get('label', "")
+ return title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series, label
def small_cover_check(path, number, cover_small, c_word, conf: config.Config, filepath, failed_folder):
@@ -177,7 +178,7 @@ def small_cover_check(path, number, cover_small, c_word, conf: config.Config, fi
def create_folder(success_folder, location_rule, json_data, conf: config.Config): # 创建文件夹
- title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series= get_info(json_data)
+ title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series, label = get_info(json_data)
if len(location_rule) > 240: # 新建成功输出文件夹
path = success_folder + '/' + location_rule.replace("'actor'", "'manypeople'", 3).replace("actor","'manypeople'",3) # path为影片+元数据所在目录
else:
@@ -265,7 +266,7 @@ def image_download(cover, number, c_word, path, conf: config.Config, filepath, f
def print_files(path, c_word, naming_rule, part, cn_sub, json_data, filepath, failed_folder, tag, actor_list, liuchu):
- title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series = get_info(json_data)
+ title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series, label = get_info(json_data)
try:
if not os.path.exists(path):
@@ -293,8 +294,7 @@ def print_files(path, c_word, naming_rule, part, cn_sub, json_data, filepath, fa
except:
aaaa = ''
print(" " + studio + "", file=code)
- print(" ", file=code)
+ print(" ", file=code)
if cn_sub == '1':
print(" 中文字幕", file=code)
if liuchu == '流出':