From 9aa19463dd5ca2f0b84270da40efe035b2550864 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 6 Dec 2020 19:48:36 +0800
Subject: [PATCH 01/27] Update core.py

---
 core.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core.py b/core.py
index fd55148..109ad13 100755
--- a/core.py
+++ b/core.py
@@ -8,6 +8,7 @@ from PIL import Image
 from ADC_function import *
 
 # =========website========
+from WebCrawler import airav
 from WebCrawler import avsox
 from WebCrawler import fanza
 from WebCrawler import fc2

From 9bed8873164443f3e097e7ae6e43f82beb8ab8a1 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 6 Dec 2020 19:50:46 +0800
Subject: [PATCH 02/27] Update core.py

---
 core.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core.py b/core.py
index 109ad13..de04995 100755
--- a/core.py
+++ b/core.py
@@ -49,6 +49,7 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
     """
 
     func_mapping = {
+        "airav": airav.main,
         "avsox": avsox.main,
         "fc2": fc2.main,
         "fanza": fanza.main,

From fea17ea7a2a0818e7536cf73a3db1d17c6960de2 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 6 Dec 2020 19:51:37 +0800
Subject: [PATCH 03/27] Update config.py

---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index 658a7ce..90b27e3 100644
--- a/config.py
+++ b/config.py
@@ -131,7 +131,7 @@ class Config:
 
         sec5 = "priority"
         conf.add_section(sec5)
-        conf.set(sec5, "website", "javbus,javdb,fanza,xcity,mgstage,fc2,avsox,jav321,xcity")
+        conf.set(sec5, "website", "airav,javbus,javdb,fanza,xcity,mgstage,fc2,avsox,jav321,xcity")
 
         sec6 = "escape"
         conf.add_section(sec6)

From 70b111fe0bfea55cb2b4ffccf19ce5e187086ae0 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 6 Dec 2020 19:53:02 +0800
Subject: [PATCH 04/27] Update config.ini

---
 config.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.ini b/config.ini
index bfaf5ce..07936f2 100644
--- a/config.ini
+++ b/config.ini
@@ -24,7 +24,7 @@ max_title_len= 50
 update_check=1
 
 [priority]
-website=javbus,javdb,fanza,xcity,mgstage,fc2,avsox,jav321,javlib,dlsite
+website=airav,javbus,javdb,fanza,xcity,mgstage,fc2,avsox,jav321,javlib,dlsite
 
 [escape]
 literals=\()/
@@ -35,4 +35,4 @@ switch=0
 
 [transalte]
 switch=0
-values=title,outline
\ No newline at end of file
+values=title,outline

From ad541a3756e7438e4178637d43ee9692626a01df Mon Sep 17 00:00:00 2001
From: oxygenkun <24502572+ddtyjmyjm@users.noreply.github.com>
Date: Sat, 26 Dec 2020 15:07:30 +0800
Subject: [PATCH 05/27] fix: failed load config.ini in function
 `moveFailedFolder`

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 13a6673..82562d5 100755
--- a/core.py
+++ b/core.py
@@ -34,7 +34,7 @@ def moveFailedFolder(filepath, failed_folder):
         root_path = str(pathlib.Path(filepath).parent)
         file_name = pathlib.Path(filepath).name
         destination_path = root_path + '/' + failed_folder + '/'
-        if config.Config.soft_link():
+        if config.Config().soft_link():
             print('[-]Create symlink to Failed output folder')
             os.symlink(filepath, destination_path + '/' + file_name)
         else:

From 62d1f375654b513c71ac25e30ca4c85ebe98bc73 Mon Sep 17 00:00:00 2001
From: oxygenkun <24502572+ddtyjmyjm@users.noreply.github.com>
Date: Sat, 26 Dec 2020 15:34:44 +0800
Subject: [PATCH 06/27] fix: wrong root path detected

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 82562d5..f83a60b 100755
--- a/core.py
+++ b/core.py
@@ -522,7 +522,7 @@ def core_main(file_path, number_th, conf: config.Config):
 
 
     filepath = file_path  # 影片的路径 绝对路径
-    rootpath = str(pathlib.Path(filepath).parent)
+    rootpath = os.getcwd() #程序根路径
     number = number_th
     json_data = get_data_from_json(number, filepath, conf)  # 定义番号
 

From 9335b446f955e3d783d3665fec666f0ac67a9369 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sat, 26 Dec 2020 23:39:57 +0800
Subject: [PATCH 07/27] Update airav.py

---
 WebCrawler/airav.py | 100 ++++++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 45 deletions(-)

diff --git a/WebCrawler/airav.py b/WebCrawler/airav.py
index 9a13cec..58263a2 100644
--- a/WebCrawler/airav.py
+++ b/WebCrawler/airav.py
@@ -110,56 +110,65 @@ def getTag(htmlcode):  # 获取标签
         tag.append(i.get_text())
     return tag
 
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<div class=\"mobileImgThumbnail\">[\s\S]*?</div></div></div></div>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<img.*?src=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            return extrafanart_imgs
+    return ''
+
 def main(number):
     try:
         try:
-            try:
-                htmlcode = get_html('https://cn.airav.wiki/video/' + number)
-                javbus_htmlcode = get_html('https://www.javbus.com/ja/' + number)
+            htmlcode = get_html('https://cn.airav.wiki/video/' + number)
+            javbus_htmlcode = get_html('https://www.javbus.com/ja/' + number)
 
 
-            except:
-                print(number)
-
-            dic = {
-                # 标题可使用airav
-                'title': str(re.sub('\w+-\d+-', '', getTitle(htmlcode))),
-                # 制作商选择使用javbus
-                'studio': getStudio(javbus_htmlcode),
-                # 年份也是用javbus
-                'year': str(re.search('\d{4}', getYear(javbus_htmlcode)).group()),
-                #  简介 使用 airav
-                'outline': getOutline(htmlcode),
-                # 使用javbus
-                'runtime': getRuntime(javbus_htmlcode),
-                # 导演 使用javbus
-                'director': getDirector(javbus_htmlcode),
-                # 作者 使用airav
-                'actor': getActor(htmlcode),
-                # 发售日使用javbus
-                'release': getRelease(javbus_htmlcode),
-                # 番号使用javbus
-                'number': getNum(javbus_htmlcode),
-                # 封面链接 使用javbus
-                'cover': getCover(javbus_htmlcode),
-
-                'imagecut': 1,
-                # 使用 airav
-                'tag': getTag(htmlcode),
-                # 使用javbus
-                'label': getSerise(javbus_htmlcode),
-                # 妈的，airav不提供作者图片
-                'actor_photo': getActorPhoto(javbus_htmlcode),
-
-                'website': 'https://www.airav.wiki/video/' + number,
-                'source': 'airav.py',
-                # 使用javbus
-                'series': getSerise(javbus_htmlcode),
-            }
-            js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4,separators=(',', ':'), )  # .encode('UTF-8')
-            return js
         except:
-            return main_uncensored(number)
+            print(number)
+
+        dic = {
+            # 标题可使用airav
+            'title': str(re.sub('\w+-\d+-', '', getTitle(htmlcode))),
+            # 制作商选择使用javbus
+            'studio': getStudio(javbus_htmlcode),
+            # 年份也是用javbus
+            'year': str(re.search('\d{4}', getYear(javbus_htmlcode)).group()),
+            #  简介 使用 airav
+            'outline': getOutline(htmlcode),
+            # 使用javbus
+            'runtime': getRuntime(javbus_htmlcode),
+            # 导演 使用javbus
+            'director': getDirector(javbus_htmlcode),
+            # 作者 使用airav
+            'actor': getActor(htmlcode),
+            # 发售日使用javbus
+            'release': getRelease(javbus_htmlcode),
+            # 番号使用javbus
+            'number': getNum(javbus_htmlcode),
+            # 封面链接 使用javbus
+            'cover': getCover(javbus_htmlcode),
+            # 剧照获取
+            'extrafanart': getExtrafanart(htmlcode),
+            'imagecut': 1,
+            # 使用 airav
+            'tag': getTag(htmlcode),
+            # 使用javbus
+            'label': getSerise(javbus_htmlcode),
+            # 妈的，airav不提供作者图片
+            'actor_photo': getActorPhoto(javbus_htmlcode),
+
+            'website': 'https://www.airav.wiki/video/' + number,
+            'source': 'airav.py',
+            # 使用javbus
+            'series': getSerise(javbus_htmlcode),
+        }
+        js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4,separators=(',', ':'), )  # .encode('UTF-8')
+        return js
     except:
         data = {
             "title": "",
@@ -171,4 +180,5 @@ def main(number):
 
 
 if __name__ == '__main__':
-    print(main('sdsi-019'))
+    print(main('ADN-188'))
+

From 0b729c3d5efe81ea8a0fe81c273c22f7c5e18a2d Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sat, 26 Dec 2020 23:43:50 +0800
Subject: [PATCH 08/27] Update fanza.py

---
 WebCrawler/fanza.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/WebCrawler/fanza.py b/WebCrawler/fanza.py
index baac89b..8dfb31d 100644
--- a/WebCrawler/fanza.py
+++ b/WebCrawler/fanza.py
@@ -209,6 +209,21 @@ def getSeries(text):
     except:
         return ""
 
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<div id=\"sample-image-block\"[\s\S]*?<br></div></div>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<img.*?src=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            s = []
+            for img_url in extrafanart_imgs:
+                img_urls = img_url.rsplit('-', 1)
+                img_url = img_urls[0] + 'jp-' + img_urls[1]
+                s.append(img_url)
+            return s
+    return ''
 
 def main(number):
     # fanza allow letter + number + underscore, normalize the input here
@@ -260,6 +275,7 @@ def main(number):
             "cover": getCover(htmlcode, fanza_hinban),
             "imagecut": 1,
             "tag": getTag(htmlcode),
+            "extrafanart": getExtrafanart(htmlcode),
             "label": getLabel(htmlcode),
             "year": getYear(
                 getRelease(htmlcode)
@@ -309,5 +325,6 @@ def main_htmlcode(number):
 
 
 if __name__ == "__main__":
-    print(main("DV-1562"))
-    print(main("96fad1217"))
+    # print(main("DV-1562"))
+    # print(main("96fad1217"))
+    print(main("pred00251"))

From b35c87919d1030dac798fc9dbd4a1351aea21687 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sat, 26 Dec 2020 23:45:11 +0800
Subject: [PATCH 09/27] Update fc2.py

---
 WebCrawler/fc2.py | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/WebCrawler/fc2.py b/WebCrawler/fc2.py
index f6b8a9b..ad483ed 100644
--- a/WebCrawler/fc2.py
+++ b/WebCrawler/fc2.py
@@ -60,6 +60,29 @@ def getYear_fc2com(release):
     except:
         return ''
 
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<ul class=\"items_article_SampleImagesArea\"[\s\S]*?</ul>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<a href=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            return extrafanart_imgs
+    return ''
+
+def getTrailer(htmlcode):
+    video_pather = re.compile(r'\'[a-zA-Z0-9]{32}\'')
+    video = video_pather.findall(htmlcode)
+    if video:
+        video_url = video[0].replace('\'', '')
+        video_url = 'https://adult.contents.fc2.com/api/v2/videos/1603395/sample?key=' + video_url
+        url_json = eval(ADC_function.get_html(video_url))['path'].replace('\\', '')
+    else:
+        video_url = ''
+
+    return url_json
+
 def main(number):
     try:
         number = number.replace('FC2-', '').replace('fc2-', '')
@@ -70,7 +93,7 @@ def main(number):
         dic = {
             'title': getTitle_fc2com(htmlcode2),
             'studio': getStudio_fc2com(htmlcode2),
-            'year': str(re.search('\d{4}', getRelease_fc2com(htmlcode2)).group()),
+            'year': getYear_fc2com(getRelease_fc2com(htmlcode2)),   
             'outline': '',  # getOutline_fc2com(htmlcode2),
             'runtime': '',
             'director': getStudio_fc2com(htmlcode2),
@@ -79,6 +102,8 @@ def main(number):
             'number': 'FC2-' + number,
             'label': '',
             'cover': getCover_fc2com(htmlcode2),
+            'extrafanart': getExtrafanart(htmlcode2),
+            "trailer": getTrailer(htmlcode2),
             'imagecut': 0,
             'tag': getTag_fc2com(number),
             'actor_photo': '',
@@ -87,10 +112,11 @@ def main(number):
             'series': '',
         }
     except Exception as e:
-        # print(e)
+        print(e)
         dic = {"title": ""}
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
     return js
 
 if __name__ == '__main__':
-    print(main('1228742'))
\ No newline at end of file
+    print(main('FC2-1603395'))
+

From 83e8e8cb44523eea4795fac612125bad3c7c3d38 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sat, 26 Dec 2020 23:57:34 +0800
Subject: [PATCH 10/27] Update jav321.py

---
 WebCrawler/jav321.py | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/WebCrawler/jav321.py b/WebCrawler/jav321.py
index 2d0b0b0..b7fd8b4 100644
--- a/WebCrawler/jav321.py
+++ b/WebCrawler/jav321.py
@@ -4,15 +4,18 @@ import json
 from bs4 import BeautifulSoup
 from lxml import html
 from ADC_function import post_html
+import re
 
 
 def main(number: str) -> json:
     result = post_html(url="https://www.jav321.com/search", query={"sn": number})
+
     soup = BeautifulSoup(result.text, "html.parser")
     lx = html.fromstring(str(soup))
 
     if "/video/" in result.url:
         data = parse_info(soup)
+
         dic = {
             "title": get_title(lx),
             "year": get_year(data),
@@ -20,6 +23,8 @@ def main(number: str) -> json:
             "director": "",
             "cover": get_cover(lx),
             "imagecut": 1,
+            "trailer": get_trailer(result.text),
+            "extrafanart": get_extrafanart(result.text),
             "actor_photo": "",
             "website": result.url,
             "source": "jav321.py",
@@ -30,7 +35,6 @@ def main(number: str) -> json:
 
     return json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'))
 
-
 def get_title(lx: html.HtmlElement) -> str:
     return lx.xpath("/html/body/div[2]/div[1]/div[1]/div[1]/h3/text()")[0].strip()
 
@@ -79,6 +83,24 @@ def get_anchor_info(h: str) -> str:
 def get_text_info(h: str) -> str:
     return h.split(": ")[1]
 
+def get_trailer(html) -> str:
+    videourl_pather = re.compile(r'<source src=\"(.*?)\"')
+    videourl = videourl_pather.findall(html)
+    if videourl:
+        return videourl[0]
+    else:
+        return ''
+
+def get_extrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<div class=\"col\-md\-3\"><div class=\"col\-xs\-12 col\-md\-12\">[\s\S]*?</script><script async src=\"\/\/adserver\.juicyads\.com/js/jads\.js\">')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<img.*?src=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            return extrafanart_imgs
+    return ''
 
 def get_cover(lx: html.HtmlElement) -> str:
     return lx.xpath("/html/body/div[2]/div[2]/div[1]/p/a/img/@src")[0]
@@ -112,6 +134,7 @@ def get_tag(data: hash) -> str:
         return ""
 
 
+
 def get_studio(data: hash) -> str:
     if "片商" in data:
         return get_anchor_info(data["片商"])
@@ -155,4 +178,4 @@ def get_series(data: hash) -> str:
 
 
 if __name__ == "__main__":
-    print(main("soe-259"))
+    print(main("jul-404"))

From da5a590bde764d83988c0079d116771b5591da2d Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 00:26:04 +0800
Subject: [PATCH 11/27] Update javbus.py

---
 WebCrawler/javbus.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WebCrawler/javbus.py b/WebCrawler/javbus.py
index a233c5e..dc3743e 100644
--- a/WebCrawler/javbus.py
+++ b/WebCrawler/javbus.py
@@ -107,6 +107,17 @@ def getTag(htmlcode):  # 获取标签
         tag.append(translateTag_to_sc(i.get_text()))
     return tag
 
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<div id=\"sample-waterfall\">[\s\S]*?</div></a>\s*?</div>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<a class=\"sample-box\" href=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            return extrafanart_imgs
+    return ''
+
 def main_uncensored(number):
     htmlcode = get_html('https://www.javbus.com/ja/' + number)
     if getTitle(htmlcode) == '':
@@ -127,6 +138,7 @@ def main_uncensored(number):
         'number': getNum(htmlcode),
         'cover': getCover(htmlcode),
         'tag': getTag(htmlcode),
+        'extrafanart': getExtrafanart(htmlcode),
         'label': getSerise(htmlcode),
         'imagecut': 0,
         'actor_photo': '',
@@ -162,6 +174,7 @@ def main(number):
                 'cover': getCover(htmlcode),
                 'imagecut': 1,
                 'tag': getTag(htmlcode),
+                'extrafanart': getExtrafanart(htmlcode),
                 'label': getSerise(htmlcode),
                 'actor_photo': getActorPhoto(htmlcode),
                 'website': 'https://www.javbus.com/' + number,

From 4c9cef5ec7d028ee4e1ea548be7c20bba8e98931 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 00:27:49 +0800
Subject: [PATCH 12/27] Update javdb.py

---
 WebCrawler/javdb.py | 105 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 79 insertions(+), 26 deletions(-)

diff --git a/WebCrawler/javdb.py b/WebCrawler/javdb.py
index b463b3d..0a7de83 100644
--- a/WebCrawler/javdb.py
+++ b/WebCrawler/javdb.py
@@ -18,18 +18,38 @@ def getActor(a):  # //*[@id="center_column"]/div[2]/div[1]/div/table/tbody/tr[1]
     result1 = str(html.xpath('//strong[contains(text(),"演員")]/../span/text()')).strip(" ['']")
     result2 = str(html.xpath('//strong[contains(text(),"演員")]/../span/a/text()')).strip(" ['']")
     return str(result1 + result2).strip('+').replace(",\\xa0", "").replace("'", "").replace(' ', '').replace(',,', '').replace('N/A', '').lstrip(',').replace(',', ', ')
-def getActorPhoto(actor): #//*[@id="star_qdt"]/li/a/img
-    a = actor.split(',')
-    d={}
-    for i in a:
-        p={i:''}
-        d.update(p)
-    return d
+
+def getaphoto(url):
+    html_page = get_html(url)
+    img_prether = re.compile(r'<span class\=\"avatar\" style\=\"background\-image\: url\((.*?)\)')
+    img_url = img_prether.findall(html_page)
+    if img_prether:
+        return img_url[0]
+    else:
+        return ''
+
+def getActorPhoto(html): #//*[@id="star_qdt"]/li/a/img
+    actorall_prether = re.compile(r'<strong>演員\:</strong>\s*?.*?<span class=\"value\">(.*)\s*?</div>')
+    actorall = actorall_prether.findall(html)
+
+    if actorall:
+        actoralls = actorall[0]
+        actor_prether = re.compile(r'<a href\=\"(.*?)\">(.*?)</a>')
+        actor = actor_prether.findall(actoralls)
+        actor_photo = {}
+        for i in actor:
+            actor_photo[i[1]] = getaphoto('https://javdb.com'+i[0])
+
+        return actor_photo
+
+    else:
+        return {}
+    
 def getStudio(a):
-#     html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
-#     result1 = str(html.xpath('//strong[contains(text(),"片商")]/../span/text()')).strip(" ['']")
-#     result2 = str(html.xpath('//strong[contains(text(),"片商")]/../span/a/text()')).strip(" ['']")
-#     return str(result1 + result2).strip('+').replace("', '", '').replace('"', '')
+    # html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    # result1 = str(html.xpath('//strong[contains(text(),"片商")]/../span/text()')).strip(" ['']")
+    # result2 = str(html.xpath('//strong[contains(text(),"片商")]/../span/a/text()')).strip(" ['']")
+    # return str(result1 + result2).strip('+').replace("', '", '').replace('"', '')
     patherr = re.compile(r'<strong>片商\:</strong>[\s\S]*?<a href=\".*?>(.*?)</a></span>')
     pianshang = patherr.findall(a)
     if pianshang:
@@ -37,6 +57,7 @@ def getStudio(a):
     else:
         result = ""
     return result
+    
 def getRuntime(a):
     html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
     result1 = str(html.xpath('//strong[contains(text(),"時長")]/../span/text()')).strip(" ['']")
@@ -53,11 +74,11 @@ def getNum(a):
     result2 = str(html.xpath('//strong[contains(text(),"番號")]/../span/a/text()')).strip(" ['']")
     return str(result2 + result1).strip('+')
 def getYear(getRelease):
-#     try:
-#         result = str(re.search('\d{4}', getRelease).group())
-#         return result
-#     except:
-#         return getRelease
+    # try:
+    #     result = str(re.search('\d{4}', getRelease).group())
+    #     return result
+    # except:
+    #     return getRelease
     patherr = re.compile(r'<strong>日期\:</strong>\s*?.*?<span class="value">(.*?)\-.*?</span>')
     dates = patherr.findall(getRelease)
     if dates:
@@ -65,11 +86,12 @@ def getYear(getRelease):
     else:
         result = ''
     return result
+
 def getRelease(a):
-#     html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
-#     result1 = str(html.xpath('//strong[contains(text(),"時間")]/../span/text()')).strip(" ['']")
-#     result2 = str(html.xpath('//strong[contains(text(),"時間")]/../span/a/text()')).strip(" ['']")
-#     return str(result1 + result2).strip('+')
+    # html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    # result1 = str(html.xpath('//strong[contains(text(),"時間")]/../span/text()')).strip(" ['']")
+    # result2 = str(html.xpath('//strong[contains(text(),"時間")]/../span/a/text()')).strip(" ['']")
+    # return str(result1 + result2).strip('+')
     patherr = re.compile(r'<strong>日期\:</strong>\s*?.*?<span class="value">(.*?)</span>')
     dates = patherr.findall(a)
     if dates:
@@ -121,6 +143,30 @@ def getCover_small(a, index=0):
                 result = 'https:' + result
             return result
 
+
+def getTrailer(htmlcode):  # 获取预告片
+    video_pather = re.compile(r'<video id\=\".*?>\s*?<source src=\"(.*?)\"')
+    video = video_pather.findall(htmlcode)
+    if video:
+        if not 'https:' in video[0]:
+            video_url = 'https:' + video[0]
+        else:
+            video_url = video[0]
+    else:
+        video_url = ''
+    return video_url
+
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<div class=\"tile\-images preview\-images\">[\s\S]*?</a>\s+?</div>\s+?</div>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<a class="tile-item" href=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            return extrafanart_imgs
+    return ''
+
 def getCover(htmlcode):
     html = etree.fromstring(htmlcode, etree.HTMLParser())
     try:
@@ -145,6 +191,10 @@ def getSeries(a):
     return str(result1 + result2).strip('+').replace("', '", '').replace('"', '')
 def main(number):
     try:
+        # if re.search(r'[a-zA-Z]+\.\d{2}\.\d{2}\.\d{2}', number).group():
+        #     pass
+        # else:
+        #     number = number.upper()
         number = number.upper()
         try:
             query_result = get_html('https://javdb.com/search?q=' + number + '&f=all')
@@ -161,7 +211,6 @@ def main(number):
         else:
             ids =html.xpath('//*[@id="videos"]/div/div/a/div[contains(@class, "uid")]/text()')
             correct_url = urls[ids.index(number)]
-       
         detail_page = get_html('https://javdb.com' + correct_url)
 
         # no cut image by default
@@ -171,7 +220,6 @@ def main(number):
             cover_small = getCover_small(query_result)
         else:
             cover_small = getCover_small(query_result, index=ids.index(number))
-        
         if 'placeholder' in cover_small:
             # replace wit normal cover and cut it
             imagecut = 1
@@ -194,17 +242,20 @@ def main(number):
             'number': number,
             'cover': getCover(detail_page),
             'cover_small': cover_small,
+            'trailer': getTrailer(detail_page),
+            'extrafanart': getExtrafanart(detail_page),
             'imagecut': imagecut,
             'tag': getTag(detail_page),
             'label': getLabel(detail_page),
-            'year': getYear(getRelease(detail_page)),  # str(re.search('\d{4}',getRelease(a)).group()),
-            'actor_photo': getActorPhoto(getActor(detail_page)),
+            'year': getYear(detail_page),  # str(re.search('\d{4}',getRelease(a)).group()),
+            'actor_photo': getActorPhoto(detail_page),
             'website': 'https://javdb.com' + correct_url,
             'source': 'javdb.py',
             'series': getSeries(detail_page),
+
         }
     except Exception as e:
-        # print(e)
+        print(e)
         dic = {"title": ""}
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
     return js
@@ -212,4 +263,6 @@ def main(number):
 # main('DV-1562')
 # input("[+][+]Press enter key exit, you can check the error messge before you exit.\n[+][+]按回车键结束，你可以在结束之前查看和错误信息。")
 if __name__ == "__main__":
-    print(main('ipx-292'))
+    # print(main('blacked.20.05.30'))
+    # print(main('AGAV-042'))
+    print(main('BANK-022'))

From 4816affc38ba1ffff48942fab47dda195f5cbfa3 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 00:28:47 +0800
Subject: [PATCH 13/27] Update mgstage.py

---
 WebCrawler/mgstage.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WebCrawler/mgstage.py b/WebCrawler/mgstage.py
index 089bbf2..e98eb5a 100644
--- a/WebCrawler/mgstage.py
+++ b/WebCrawler/mgstage.py
@@ -95,6 +95,18 @@ def getSeries(a):
     result2 = str(html.xpath('//th[contains(text(),"シリーズ")]/../td/text()')).strip(" ['']").strip('\\n    ').strip(
         '\\n')
     return str(result1 + result2).strip('+').replace("', '", '').replace('"', '')
+
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<dd>\s*?<ul>[\s\S]*?</ul>\s*?</dd>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<a class=\"sample_image\" href=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            return extrafanart_imgs
+    return ''
+
 def main(number2):
     number=number2.upper()
     htmlcode=str(get_html('https://www.mgstage.com/product/product_detail/'+str(number)+'/',cookies={'adc':'1'}))
@@ -115,6 +127,7 @@ def main(number2):
         'imagecut': 0,
         'tag': getTag(a),
         'label':getLabel(a),
+        'extrafanart': getExtrafanart(htmlcode),
         'year': getYear(getRelease(a)),  # str(re.search('\d{4}',getRelease(a)).group()),
         'actor_photo': '',
         'website':'https://www.mgstage.com/product/product_detail/'+str(number)+'/',

From fc15e119caafc45c60a506190ac0fdd179c20ca7 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 00:29:25 +0800
Subject: [PATCH 14/27] Update xcity.py

---
 WebCrawler/xcity.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/WebCrawler/xcity.py b/WebCrawler/xcity.py
index 21a1389..3508b39 100644
--- a/WebCrawler/xcity.py
+++ b/WebCrawler/xcity.py
@@ -154,6 +154,20 @@ def getSeries(htmlcode):
     except:
         return ''
 
+def getExtrafanart(htmlcode):  # 获取剧照
+    html_pather = re.compile(r'<div id="sample_images".*?>[\s\S]*?</div>')
+    html = html_pather.search(htmlcode)
+    if html:
+        html = html.group()
+        extrafanart_pather = re.compile(r'<a.*?href=\"(.*?)\"')
+        extrafanart_imgs = extrafanart_pather.findall(html)
+        if extrafanart_imgs:
+            s = []
+            for urli in extrafanart_imgs:
+                urli = 'https:' + urli.replace('/scene/small', '')
+                s.append(urli)
+            return s
+    return ''
 
 def main(number):
     try:
@@ -174,6 +188,7 @@ def main(number):
             'number': getNum(detail_page),
             'cover': getCover(detail_page),
             'cover_small': '',
+            'extrafanart': getExtrafanart(detail_page),
             'imagecut': 1,
             'tag': getTag(detail_page),
             'label': getLabel(detail_page),

From b0646ab6daec061bd1448759fce31cb57501ee31 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 00:31:26 +0800
Subject: [PATCH 15/27] Update ADC_function.py

---
 ADC_function.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ADC_function.py b/ADC_function.py
index 824b6d4..617f7e3 100755
--- a/ADC_function.py
+++ b/ADC_function.py
@@ -463,3 +463,14 @@ def translate(src:str,target_language:str="zh_cn"):
     translate_list = [i["trans"] for i in result.json()["sentences"]]
 
     return "".join(translate_list)
+
+# ========================================================================是否为无码
+def is_uncensored(number):
+    if re.match('^\d{4,}', number) or re.match('n\d{4}', number) or 'HEYZO' in number.upper():
+        return True
+    configs = config.Config().get_uncensored()
+    prefix_list = str(configs[0]).split('|')
+    for pre in prefix_list:
+        if pre.upper() in number.upper():
+            return True
+    return False

From 07bb677822aa1815298069fdfc4eea4895db70d8 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 01:15:40 +0800
Subject: [PATCH 16/27] Update config.py

---
 config.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/config.py b/config.py
index 90b27e3..9070c72 100644
--- a/config.py
+++ b/config.py
@@ -45,6 +45,35 @@ class Config:
         return self.conf.getboolean("common", "transalte_to_sc")
     def is_transalte(self) -> bool:
         return self.conf.getboolean("transalte", "switch")
+    def is_trailer(self) -> bool:
+        return self.conf.getboolean("trailer", "switch")
+
+    def is_watermark(self) -> bool:
+        return self.conf.getboolean("watermark", "switch")
+
+    def is_extrafanart(self) -> bool:
+        return self.conf.getboolean("extrafanart", "switch")   
+    
+    def watermark_type(self) -> int:
+        return int(self.conf.get("watermark", "water"))
+
+    def get_uncensored(self):
+        try:
+            sec = "uncensored"
+            uncensored_prefix = self.conf.get(sec, "uncensored_prefix")
+            # uncensored_poster = self.conf.get(sec, "uncensored_poster")
+            return uncensored_prefix
+
+        except ValueError:
+            self._exit("uncensored")
+
+    def get_extrafanart(self):
+        try:
+            extrafanart_download = self.conf.get("extrafanart", "extrafanart_folder")
+            return extrafanart_download
+        except ValueError:
+            self._exit("extrafanart_folder")
+            
     def transalte_values(self) -> bool:
         return self.conf.get("transalte", "values")
     def proxy(self) -> [str, int, int, str]:
@@ -58,7 +87,13 @@ class Config:
             return switch, proxy, timeout, retry, proxytype
         except ValueError:
             self._exit("common")
+            
+    def media_rule(self) -> str:
+        return self.conf.get('media', 'media_type').replace(',', '|')
 
+    def sub_rule(self):
+        return self.conf.get('media', 'sub_type').split(',')
+            
     def naming_rule(self) -> str:
         return self.conf.get("Name_Rule", "naming_rule")
 
@@ -146,6 +181,29 @@ class Config:
         conf.add_section(sec8)
         conf.set(sec8, "switch", "0")
         conf.set(sec8, "values", "title,outline")
+        
+        sec9 = "trailer"
+        conf.add_section(sec9)
+        conf.set(sec9, "switch", "0")
+
+        sec10 = "uncensored"
+        conf.add_section(sec10)
+        conf.set(sec10, "uncensored_prefix", "S2M,BT,LAF,SMD")
+
+        sec11 = "media"
+        conf.add_section(sec11)
+        conf.set(sec11, "media_type", ".mp4,.avi,.rmvb,.wmv,.mov,.mkv,.flv,.ts,.webm,.MP4,.AVI,.RMVB,.WMV,.MOV,.MKV,.FLV,.TS,.WEBM,iso,ISO")
+        conf.set(sec11, "sub_type", ".smi,.srt,.idx,.sub,.sup,.psb,.ssa,.ass,.txt,.usf,.xss,.ssf,.rt,.lrc,.sbv,.vtt,.ttml")
+
+        sec12 = "watermark"
+        conf.add_section(sec12)
+        conf.set(sec12, "switch", 1)
+        conf.set(sec12, "water", 2)
+
+        sec13 = "extrafanart"
+        conf.add_section(sec13)
+        conf.set(sec13, "switch", 1)
+        conf.set(sec13, "extrafanart_folder", "extrafanart")
 
         return conf
 

From 3742294ce9d373f36c71a37c3f59c3294c7d614e Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 01:41:07 +0800
Subject: [PATCH 17/27] Update core.py

---
 core.py | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 150 insertions(+), 21 deletions(-)

diff --git a/core.py b/core.py
index 13a6673..63d8ef5 100755
--- a/core.py
+++ b/core.py
@@ -238,6 +238,7 @@ def get_info(json_data):  # 返回json里的数据
     release = json_data.get('release')
     number = json_data.get('number')
     cover = json_data.get('cover')
+    trailer = json_data.get('trailer')
     website = json_data.get('website')
     series = json_data.get('series')
     label = json_data.get('label', "")
@@ -326,6 +327,44 @@ def download_file_with_filename(url, filename, path, conf: config.Config, filepa
     moveFailedFolder(filepath, failed_folder)
     return
 
+def trailer_download(trailer, c_word, number, path, filepath, conf: config.Config, failed_folder):
+    if download_file_with_filename(trailer, number + c_word + '-trailer.mp4', path, conf, filepath, failed_folder) == 'failed':
+        return
+    switch, _proxy, _timeout, retry, _proxytype = conf.proxy()
+    for i in range(retry):
+        if os.path.getsize(path+'/' + number + c_word + '-trailer.mp4') == 0:
+            print('[!]Video Download Failed! Trying again. [{}/3]', i + 1)
+            download_file_with_filename(trailer, number + c_word + '-trailer.mp4', path, conf, filepath, failed_folder)
+            continue
+        else:
+            break
+    if os.path.getsize(path + '/' + number + c_word + '-trailer.mp4') == 0:
+        return
+    print('[+]Video Downloaded!', path + '/' + number + c_word + '-trailer.mp4')
+
+# 剧照下载成功，否则移动到failed
+def extrafanart_download(data, path, conf: config.Config, filepath, failed_folder):
+    j = 1
+    path = path + '/' + conf.get_extrafanart()
+    for url in data:
+        if download_file_with_filename(url, '/extrafanart-' + str(j)+'.jpg', path, conf, filepath, failed_folder) == 'failed':
+            moveFailedFolder(filepath, failed_folder)
+            return
+        switch, _proxy, _timeout, retry, _proxytype = conf.proxy()
+        for i in range(retry):
+            if os.path.getsize(path + '/extrafanart-' + str(j) + '.jpg') == 0:
+                print('[!]Image Download Failed! Trying again. [{}/3]', i + 1)
+                download_file_with_filename(url, '/extrafanart-' + str(j)+'.jpg', path, conf, filepath,
+                                            failed_folder)
+                continue
+            else:
+                break
+        if os.path.getsize(path + '/extrafanart-' + str(j) + '.jpg') == 0:
+            return
+        print('[+]Image Downloaded!', path + '/extrafanart-' + str(j) + '.jpg')
+        j += 1
+
+
 
 # 封面是否下载成功，否则移动到failed
 def image_download(cover, number, c_word, path, conf: config.Config, filepath, failed_folder):
@@ -397,6 +436,7 @@ def print_files(path, c_word, naming_rule, part, cn_sub, json_data, filepath, fa
             print("  <num>" + number + "</num>", file=code)
             print("  <premiered>" + release + "</premiered>", file=code)
             print("  <cover>" + cover + "</cover>", file=code)
+            print("  <trailer>" + trailer + "</trailer>", file=code)
             print("  <website>" + website + "</website>", file=code)
             print("</movie>", file=code)
             print("[+]Wrote!            " + path + "/" + number + part + c_word + ".nfo")
@@ -428,9 +468,70 @@ def cutImage(imagecut, path, number, c_word):
         shutil.copyfile(path + '/' + number + c_word + '-fanart.jpg',path + '/' + number + c_word + '-poster.jpg')
         print('[+]Image Copyed!     ' + path + '/' + number + c_word + '-poster.jpg')
 
+# 此函数从gui版copy过来用用
+# 参数说明
+# poster_path
+# thumb_path
+# cn_sub   中文字幕  参数值为 1  0
+# leak     流出     参数值为 1   0
+# uncensored 无码   参数值为 1   0
+# ========================================================================加水印
+def add_mark(poster_path, thumb_path, cn_sub, leak, uncensored, conf:config.Config):
+    mark_type = ''
+    if cn_sub:
+        mark_type += ',字幕'
+    if leak:
+        mark_type += ',流出'
+    if uncensored:
+        mark_type += ',无码'
+    add_mark_thread(thumb_path, cn_sub, leak, uncensored, conf)
+    print('[+]Thumb Add Mark:    ' + mark_type.strip(','))
+    add_mark_thread(poster_path, cn_sub, leak, uncensored, conf)
+    print('[+]Poster Add Mark:   ' + mark_type.strip(','))
+
+def add_mark_thread(pic_path, cn_sub, leak, uncensored, conf):
+    size = 14
+    img_pic = Image.open(pic_path)
+    # 获取自定义位置，取余配合pos达到顺时针添加的效果
+    # 左上 0, 右上 1, 右下 2， 左下 3
+    count = conf.watermark_type()
+    if cn_sub == 1 or cn_sub == '1':
+        add_to_pic(pic_path, img_pic, size, count, 1)  # 添加
+        count = (count + 1) % 4
+    if leak == 1 or leak == '1':
+        add_to_pic(pic_path, img_pic, size, count, 2)
+        count = (count + 1) % 4
+    if uncensored == 1 or uncensored == '1':
+        add_to_pic(pic_path, img_pic, size, count, 3)
+    img_pic.close()
+
+def add_to_pic(pic_path, img_pic, size, count, mode):
+    mark_pic_path = ''
+    if mode == 1:
+        mark_pic_path = 'Img/SUB.png'
+    elif mode == 2:
+        mark_pic_path = 'Img/LEAK.png'
+    elif mode == 3:
+        mark_pic_path = 'Img/UNCENSORED.png'
+    img_subt = Image.open(mark_pic_path)
+    scroll_high = int(img_pic.height / size)
+    scroll_wide = int(scroll_high * img_subt.width / img_subt.height)
+    img_subt = img_subt.resize((scroll_wide, scroll_high), Image.ANTIALIAS)
+    r, g, b, a = img_subt.split()  # 获取颜色通道，保持png的透明性
+    # 封面四个角的位置
+    pos = [
+        {'x': 0, 'y': 0},
+        {'x': img_pic.width - scroll_wide, 'y': 0},
+        {'x': img_pic.width - scroll_wide, 'y': img_pic.height - scroll_high},
+        {'x': 0, 'y': img_pic.height - scroll_high},
+    ]
+    img_pic.paste(img_subt, (pos[count]['x'], pos[count]['y']), mask=a)
+    img_pic.save(pic_path, quality=95)
+# ========================结束=================================
 
 def paste_file_to_folder(filepath, path, number, c_word, conf: config.Config):  # 文件路径，番号，后缀，要移动至的位置
-    houzhui = str(re.search('[.](iso|ISO|AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm)$', filepath).group())
+    media_res = conf.media_rule()
+    houzhui = str(re.search(media_res + '$', filepath).group())
     file_parent_origin_path = str(pathlib.Path(filepath).parent)
     try:
         # 如果soft_link=1 使用软链接
@@ -438,15 +539,14 @@ def paste_file_to_folder(filepath, path, number, c_word, conf: config.Config):
             os.symlink(filepath, path + '/' + number + c_word + houzhui)
         else:
             os.rename(filepath, path + '/' + number + c_word + houzhui)
-        if os.path.exists(file_parent_origin_path + '/' + number + c_word + '.srt'):  # 字幕移动
-            os.rename(file_parent_origin_path + '/' + number + c_word + '.srt', path + '/' + number + c_word + '.srt')
-            print('[+]Sub moved!')
-        elif os.path.exists(file_parent_origin_path + '/' + number + c_word + '.ssa'):
-            os.rename(file_parent_origin_path + '/' + number + c_word + '.ssa', path + '/' + number + c_word + '.ssa')
-            print('[+]Sub moved!')
-        elif os.path.exists(file_parent_origin_path + '/' + number + c_word + '.sub'):
-            os.rename(file_parent_origin_path + '/' + number + c_word + '.sub', path + '/' + number + c_word + '.sub')
-            print('[+]Sub moved!')
+        sub_res = conf.sub_rule()
+        
+        for subname in sub_res:
+            if os.path.exists(os.getcwd() + '/' + number + c_word + subname):  # 字幕移动
+                os.rename(os.getcwd() + '/' + number + c_word + subname, path + '/' + number + c_word + subname)
+                print('[+]Sub moved!')
+                return True
+        
     except FileExistsError:
         print('[-]File Exists! Please check your movie!')
         print('[-]move to the root folder of the program.')
@@ -459,23 +559,22 @@ def paste_file_to_folder(filepath, path, number, c_word, conf: config.Config):
 def paste_file_to_folder_mode2(filepath, path, multi_part, number, part, c_word, conf):  # 文件路径，番号，后缀，要移动至的位置
     if multi_part == 1:
         number += part  # 这时number会被附加上CD1后缀
-    houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm|iso|ISO)$', filepath).group())
+    media_res = conf.media_rule()
+    houzhui = str(re.search(media_res + '$', filepath).group())
     file_parent_origin_path = str(pathlib.Path(filepath).parent)
     try:
         if conf.soft_link():
             os.symlink(filepath, path + '/' + number + part + c_word + houzhui)
         else:
             os.rename(filepath, path + '/' + number + part + c_word + houzhui)
-        if os.path.exists(file_parent_origin_path + '/' + number + '.srt'):  # 字幕移动
-            os.rename(file_parent_origin_path + '/' + number + part + c_word + '.srt', path + '/' + number + part + c_word + '.srt')
-            print('[+]Sub moved!')
-        elif os.path.exists(file_parent_origin_path + '/' + number + part + c_word + '.ass'):
-            os.rename(file_parent_origin_path + '/' + number + part + c_word + '.ass', path + '/' + number + part + c_word + '.ass')
-            print('[+]Sub moved!')
-        elif os.path.exists(file_parent_origin_path + '/' + number + part + c_word + '.sub'):
-            os.rename(file_parent_origin_path + '/' + number + part + c_word + '.sub', path + '/' + number + part + c_word + '.sub')
-            print('[+]Sub moved!')
-        print('[!]Success')
+        
+        sub_res = conf.sub_rule()
+        for subname in sub_res:
+            if os.path.exists(os.getcwd() + '/' + number + c_word + subname):  # 字幕移动
+                os.rename(os.getcwd() + '/' + number + c_word + subname, path + '/' + number + c_word + subname)
+                print('[+]Sub moved!')
+                print('[!]Success')
+                return True
     except FileExistsError:
         print('[-]File Exists! Please check your movie!')
         print('[-]move to the root folder of the program.')
@@ -546,8 +645,19 @@ def core_main(file_path, number_th, conf: config.Config):
     if '-c.' in filepath or '-C.' in filepath or '中文' in filepath or '字幕' in filepath:
         cn_sub = '1'
         c_word = '-C'  # 中文字幕影片后缀
+    
+    # 判断是否无码
+    if is_uncensored(number):
+        uncensored = 1
+    else:
+        uncensored = 0
+    
+    
     if '流出' in filepath:
         liuchu = '流出'
+        leak = 1
+    else:
+        leak = 0
 
     # 调试模式检测
     if conf.debug():
@@ -570,6 +680,14 @@ def core_main(file_path, number_th, conf: config.Config):
         # creatFolder会返回番号路径
         image_download( json_data.get('cover'), number, c_word, path, conf, filepath, conf.failed_folder())
 
+        # 下载预告片
+        if json_data.get('trailer'):
+            trailer_download(json_data.get('trailer'), c_word, number, path, filepath, conf, conf.failed_folder())
+
+        # 下载剧照 data, path, conf: config.Config, filepath, failed_folder
+        if json_data.get('extrafanart'):
+            extrafanart_download(json_data.get('extrafanart'), path, conf, filepath, conf.failed_folder())
+        
         # 裁剪图
         cutImage(imagecut, path, number, c_word)
 
@@ -578,6 +696,17 @@ def core_main(file_path, number_th, conf: config.Config):
 
         # 移动文件
         paste_file_to_folder(filepath, path, number, c_word, conf)
+        
+        poster_path = path + '/' + number + c_word + '-poster.jpg'
+        thumb_path = path + '/' + number + c_word + '-thumb.jpg'
+        if conf.is_watermark():
+            add_mark(poster_path, thumb_path, cn_sub, leak, uncensored, conf)
+        
     elif conf.main_mode() == 2:
         # 移动文件
         paste_file_to_folder_mode2(filepath, path, multi_part, number, part, c_word, conf)
+        poster_path = path + '/' + number + c_word + '-poster.jpg'
+        thumb_path = path + '/' + number + c_word + '-thumb.jpg'
+        if conf.is_watermark():
+            add_mark(poster_path, thumb_path, cn_sub, leak, uncensored, conf)
+        

From 9f015a16e32525e21597a539b85563daa9094fed Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 10:43:53 +0800
Subject: [PATCH 18/27] Update config.ini

---
 config.ini | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/config.ini b/config.ini
index 07936f2..51198ea 100644
--- a/config.ini
+++ b/config.ini
@@ -36,3 +36,29 @@ switch=0
 [transalte]
 switch=0
 values=title,outline
+
+; 预告片
+[trailer]
+switch=1
+
+; 用来确定是否是无码
+[uncensored]
+uncensored_prefix=S2M,BT,LAF,SMD
+
+
+[media]
+; 影片后缀
+media_type=.mp4,.avi,.rmvb,.wmv,.mov,.mkv,.flv,.ts,.webm,.MP4,.AVI,.RMVB,.WMV,.MOV,.MKV,.FLV,.TS,.WEBM,iso,ISO
+; 字幕后缀
+sub_type=.smi,.srt,.idx,.sub,.sup,.psb,.ssa,.ass,.txt,.usf,.xss,.ssf,.rt,.lrc,.sbv,.vtt,.ttml
+
+; 水印
+[watermark]
+switch=1
+water=2
+; 左上 0, 右上 1, 右下 2， 左下 3
+
+; 剧照
+[extrafanart]
+switch=1
+extrafanart_folder=extrafanart

From 8f4c2b6241c28cd0b25b631c385c39ee21a6776a Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 10:47:58 +0800
Subject: [PATCH 19/27] Update ADC_function.py

---
 ADC_function.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ADC_function.py b/ADC_function.py
index 617f7e3..bf52378 100755
--- a/ADC_function.py
+++ b/ADC_function.py
@@ -1,6 +1,6 @@
 import requests
 from lxml import etree
-
+import re
 import config
 
 SUPPORT_PROXY_TYPE = ("http", "socks5", "socks5h")
@@ -469,7 +469,7 @@ def is_uncensored(number):
     if re.match('^\d{4,}', number) or re.match('n\d{4}', number) or 'HEYZO' in number.upper():
         return True
     configs = config.Config().get_uncensored()
-    prefix_list = str(configs[0]).split('|')
+    prefix_list = str(configs).split(',')
     for pre in prefix_list:
         if pre.upper() in number.upper():
             return True

From 461f1ba2f5b449b257ba3e230031da5dc4c06dd3 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 10:53:50 +0800
Subject: [PATCH 20/27] Update core.py

---
 core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 63d8ef5..09ec5bb 100755
--- a/core.py
+++ b/core.py
@@ -251,7 +251,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, label = get_info(json_data)
+    title, studio, year, outline, runtime, director, actor_photo, release, number, cover, trailer, 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:
@@ -387,7 +387,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, label = get_info(json_data)
+    title, studio, year, outline, runtime, director, actor_photo, release, number, cover, trailer, website, series, label = get_info(json_data)
 
     try:
         if not os.path.exists(path):

From 2ac4f550cad6fd800154783af726b25e3319dc46 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 10:54:44 +0800
Subject: [PATCH 21/27] Update core.py

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 09ec5bb..0e15157 100755
--- a/core.py
+++ b/core.py
@@ -242,7 +242,7 @@ def get_info(json_data):  # 返回json里的数据
     website = json_data.get('website')
     series = json_data.get('series')
     label = json_data.get('label', "")
-    return title, studio, year, outline, runtime, director, actor_photo, release, number, cover, website, series, label
+    return title, studio, year, outline, runtime, director, actor_photo, release, number, cover, trailer, website, series, label
 
 
 def small_cover_check(path, number, cover_small, c_word, conf: config.Config, filepath, failed_folder):

From 70002fa2a94234c773e982fe4a996e4ab95c44f2 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 11:00:38 +0800
Subject: [PATCH 22/27] Create test

---
 Img/test | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Img/test

diff --git a/Img/test b/Img/test
new file mode 100644
index 0000000..83f4927
--- /dev/null
+++ b/Img/test
@@ -0,0 +1 @@
+12312

From 51f5d111dbced49ad06e0eb2324ab3da995a0b2e Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 11:01:21 +0800
Subject: [PATCH 23/27] Add files via upload

---
 Img/LEAK.png       | Bin 0 -> 13236 bytes
 Img/SUB.png        | Bin 0 -> 10532 bytes
 Img/UNCENSORED.png | Bin 0 -> 11067 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Img/LEAK.png
 create mode 100644 Img/SUB.png
 create mode 100644 Img/UNCENSORED.png

diff --git a/Img/LEAK.png b/Img/LEAK.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f68225281a2232339ec8d36617f42985b97da01
GIT binary patch
literal 13236
zcmd6OXH-+`vo}TL(2oTX5K!q|x_~r6QIM`8HA)c?Ap!w}06|evdT$B@X-WywArLr<
zln_d!MY>1}#DrrA<dBeXgB<aH-}~iV>-})wwKjVtVei>felyR^JhNX~TblB43UM+q
zG4WizVq(k0#7tuRDg1Gm@ry>QQ7;pd8u+S-(e+1@_!*8z*Ow4cKd2X62)+$B4t;2V
zjotM1Z6Gv+0fD$NSS;t8v#qgjlK;GN<qJ9Q{W`VXIO;o92ORa@_%t(%#CHxVu|wPI
zsOnXzJIk+gJfuQ9^w*8o74vfPU(P9eQ3oL>xu5TzK701;ZeoI=iOC_X$^SS-Su%e6
z@2CI2FG~Qk77HGgoUFg5=~&v!i8}3Y8?RJXndb?ws=C(Dkcpg7^mN;znwTuIS|I7S
zN+<L)avFJ6d$t-B8V{j_P%;w_^2Iqyc~U)lj~fCdJcU%vm;rL~ik%*fRpzUFy&ZX)
zN>o-sKOb3EUokUC7PS{qnV=rmL}}jYhm8$Q<*dmT38+4LuTa%cj=08`F<&yAhrwhF
zgEGtOjweX^;N1n&={51{_30er<h;QdyILpYMe}5MTIPfJqlUmJ$&;8Y!ehS7cM}EE
zly9BpT(ZwL)lg-`#3ioK&(k)d8j-SOp;j|H$xbao#%2}RGdQq1etlY=1}2-~2sg>a
zTW?)s(^4zauQxEYNPoV{!LK2!JbTrDiS6cbT=7ZiOZMx8xA|jnpy5n8UzlU^Gy-|`
z2>;BD*~`+tGS&8%aC!BESA8nT8yX0CM?6|C=B7^l$HFCE#R{yKxrpO8^tZ2liUIcu
zjk!+c0zT($oXW+aPsQBL5;z+&7;x`y#@#Qi?r`Iga`mx7Sze3ad#Sc!;A8R>?`Gp;
zr-atg&2kAr_u`F<<SEFv)?jgz&^-F@+UFS>^_6F~=;q!J9imSO-5QUorDTm&SGI4_
z?PMz}tz#(Z{I)kAIv`MM{Bj0L%5N+4dD)&%aLH7dI?Ui{S5~RD?eZ0`jOQ{p6A-%X
zIB~uhHe_5;E3#FsBc0c0s_*a0%#5f4FY3*+{b~|3$qG?~l}kA%kf(6=P3_Y*CEyvr
zErSfqfXJfJf_-qa4=0*gWbeRnlf+s%C`s_l%?5;6CT-ig;Pm#otV@Zh$1A76-QwXE
zNQvi*Vj*`nG_CT=2uqGH&bd*V-X8Ams|d`VG7nt9G>G$JqkbNdTok?zIh;9oAUX^Q
zR%`8r)+eDJ?iyw~v8R6&m5w4TND4N+6==*5vt7UED{l2l$J{PWIGI%kx_5*{Gr3fm
zXYZ_F3W<|nfW<&t`LP&eW0D6V)HWLa0`|cW7B1`4U*u`K3Iz0JjWvLhcCH2rE-o?u
zdw<a(m#V;3a5{Z^EgR^0t2?Hgzpl!~q@|k^9Z`JTIKICjq9{_k@5XAiqt5l`r~cId
zGa}F-@8hD^+|%A3E*-Pxfyk4Q(V?|WVR{0-j%U++t8Vm9IZR#Q8nGW#VFwxRAIhvQ
zRqojr1ce^rb|`0kk^umobxbx;-O5ft=%mx6Q)aM+@h`1J5e|V$3PN~NlzgVj-wxFV
z6Q{VAcTNN@g}2oHi235!S6!Yje?U3p2uUpX{qFWGH`UF3<bm&{mcNA1xYM2)TAoGZ
zh6stIoYv;&+CLSxr!yYtF0|4hVO?&%k?a{;6(qa%iVcnUqJuibzwy<!UraS(RcCqM
zI#I4e&=|@Etie4oDP>+<sjGt40Hp<>XtH3R4OAVvu3|rK0r`@r7x=G?>>vRn`!M%w
z_G7Pd8WU6ft{gQa-}W!nSYvzGS?kod(5D@^VZTpWDcY4I$dH{h6-AE@zC(oAbzHZx
zKOxTw;?w^I%EhbYSaVVWGcAMr_d&-vBmSW9neRSmZOe<LIHJxogZS$I5`y}nL#lk`
z&mAa(d=_hFfFCxcNHy9f{n?XylM{-Q`KWH(wd3O?@4fuuKo9UN2CL`am&G@QpB^y_
zkyGP-$AT5&Yp_y!77p5CCvq*FJ^xEAlFnfoJK!l2Y=<Ymt!|7z1X5J2<F?lNs(XX4
z;a@E3Krv^qyJITXDUwaLm<aONC9iO@%G**4x#csBd`qrg*}pG5f;Ai3!bSQFgcybt
zb&dZS)QNEOUO#o9Mv~4U8oO`jBGsaxTvPI-7ALf|HpFlGjjPQ`H|kr;vxonhhZnnf
zh@uvO2d~B{euyGWwroVM9j3bbf>#bM2;$z;8h0$+WM-Ar5V)!z6I!ZbA>|2?i1t<V
znbSQ`T(vto!&PvriWVEPamBE@YG8R{?K$NO#T)-0jI&}5R?(*2xlVncsg)>Kr;W<F
z3g~X%G{-N`m{~F0{jhR}xNS>KeXml=&w{ly(~_tVmKojpjQ{Nn)zat!jyk}prjM$B
zp!4`W9V`8yR?gbf2M*wB1>Lo$TIbx30NkC>VS(4(bbS66+Hv2P@87@?MW}<y2PM6q
zOUu6-FJM?b402-6v4;B-n!-5_E*XJlRj;>Cs0*OwXJB`Gt=Dl}ftx!A5D3$ILZ70~
zQAb&w!XE^kr@Gr7fGt9VL~Y$9zH69?AUtVKazUKt{Usto)M(d#wS%u|d+?dRJ}V_`
zLxP{wajS#rm#33M(U89#vboK?OY)TtgJQ;Sbu(DM<IR4+mjIN#r``r{o2kf7s=b+w
zZ>mIic>k7602-3?&$R~mu|N5+HwxZwIhmXOLL#VxiH6efz0sPQU=!s!d(=lPsOW<G
z>Y@K24XNpGF9kpG7l+!j(J%)<h-9S*9DMm-{E)y)@=867Vy%f_`njC!seDGv2zX+~
z{9~}`733!Bs7te5t_d46T<kG@g=eHVsQ*pu8<E)Z!YeV2U%+m&=l)d&*&e-nKU+q7
zh3k{QOfxHdH%c_G!}Nj*T||ZNr?C)sq9Y-fhYqt-7C0h2=Tj6~94OW03u^;7;!6BO
zL-H|n7QQa@5D8;{jpe8DfXxgrqwQ6PM3Q%rqEojGckfaIWZ|~XxW!29H`(n=4^Bd<
z%-FQ1vd}{y-j@9(h>cbl@9HK$XfNIBqXq26?%eZE86N=}K{O)LiwpF>5)XCIzuYt=
zv!dB^-9YY<3(FQQK8`Z`3s@&BZMI(YXy|=#!%LtO@<`~2&SbS=hk??qZn1cKzLHj5
zmXJy|kQh6SI=TrrQik99c!RKKz1ed{1vipy7ZyWGj(4Al(ad@yhTVWR)edI1#g(aB
zk+Oi!X$GYUtRS(&w7M^naHApZQ0{%L%s-yh!ZhfK`uOL!-4~rtgBs+XloGaju-V%(
zhLC(lynRguN|nK`U+y2KiAbNC-N)_hd&6BfjC0HUV&D4Y)@|yNU;15HX8ooZ{cuS7
zqx+TT?=yqM*k~DJ^YD(j25Qs(603CzJvX7_sx;GF?tQUeCriFVg_|Uce$~B|UTg=}
zdme_VLJ2EkEiz-SY-AJ$taHX>>eee%1~8H;+s}G&7xj24X>l>DbU*v`sWlBWM8A*(
z33=2JD|KGI{f*QDWlGp-{AA2!@_rZ#;UNhO7%wi4xkU(^$e@#VTYO`!@{A#J?>bI(
zgb#{C0nL$@TrCC1WQ^ADIxnR7HhXk*EkLz$L`tcFRnxEV8fa4wNi03QFN`B3{twol
zpr{rh0q#EQqsKiH&3Ruv*LH@+_ki@SVtV&ZZh54VRlLXwSMjCm4~tl7Bcqo@Cn6Ub
zr9(Xx$=@onHuG$MoW&ZeeggrUj!AZXFZ>A@JXF5oFIldhM`4x9{h2W%Pa>A}L00)z
z1z80XSi{|p=2g*&V55>WsFtAth+YpH;!kPq^nsGCMj!>@TR&KSqMwxOlR0iYe!`*4
z$({Ucftc!_Z52gW-B=ZQ5GTZsg?zctEk1>>EADb-o^gJ33$tRTQ#<Dajgc^2oAq<r
z!XMrjt)+TP;RG;g1EY*A(+&)GD>=_##NKt~b9Q^eVUp=MH>o$6x{>+Lm09od3ajHa
zX<jf73Hr$b-ZXXU)scNTZRwFB*|pxH;9-F>0;G8T<M?AfEjYabSf!@chIQ_as-I!e
zq;ZFj!+X<6%Sc4nQ+vatzNso)paWOZBOVgrhcH7uA7uUaV^ULx3<2RgZ~JJo&ECcy
z76p;e_#`bl_+}{_PBcg6vb@?+@_vMHU7`o<oD^(RGn>6~60kxpENH%7NnQC%xT$Je
z2kYWKzSiNX8X)r1$KXCqRkU$+!^RV0TS8dhz-1($^4O<G1Zbts9oZT8q!eJVVp@lT
zG)hg7wfK^)b>8Dy_0lqlJP<8B%x!fpLOvoqPg!B(LI1h!bAgFZmmZ{AuxSSn&5%_?
zB+I^09d^Byew7(M!ynxrRoi*PrUp=;-Hj0yH~#&n<G4^4vX3lg#4R5GD?@LC++^8`
zpZ~6gQR+)Ud3g*yTX56MQeF-Wg$0cxwlZHo+@1{_$+<8TGMQgfA8*%k)V|sDP2&3X
z-F2GeCEEbJSye%WzM++VI{-8EVN4h!EQ#H9R<j}-7~?f75B;=i2t<)=6mxdkk=`&K
z*8_W<)-ytBKBUvRX(I-$MvgRT(wA@;AxSJyacnnmE||u-A5VR)oO}@OrD4zDv!BDL
zl}-Yk%y3AweuNdA5GTIwcybtP2#K6MKQl+pdWB*7nLzunx~$$nozsT8v$aU}aA%yz
zWCraXj_B2-aTQN@)I%6Pk+NzW1Z;}R{$u|k4Djpa^PlxE3u)0~mR<QEX2HiyI(#TB
zB#mCtP~fOh`T22V$RohaR29UQdtZV2=#1Pl_TJ%Rhnu9Jd`$yy8#8sGR4pvPt7??i
zQsAOi`}r}fIE4FZ!hR6I@WE4S{}`w*LMmD4zlv?tjyTWtlhRL?F=|*dMmd;#C+0pN
zi$YBBA%Z(^|GS_t?k9VqGs5tIBG;Pl58{WCDt?6iT3Hz}mtYK)m*oq72X7?T$geEU
zlm7EY0d&UX_v|WBH)SyZ-t{cGm~@a3u!A5hE~{crWmkS|qTF;KS8_`a?JICEAixct
zz?kSAjX#KQ{9lL!ia-G^{w@fJi$kYgt&Hgjeh*}uxL|Hz5F*&~RI{~2;D*|a{7@IK
zHt=fu)p3y-ITh*Ps}v-wn{ME(t>XpB;sQgxtMUSJBD90&lXb9T<;)~Zyts#vQEB`@
z+>L_vtyl3zL=(sC3+YD{$Wogm?8vyIqgOc}*gr@{V4G)3KrzI0vtD4eSSNBa*LH;G
z1M%<WNa6$1Id30l33swo?@sjL&@;iue`z+17Uh}}QV>HISTNa?^>*yeb)N_TJb2M#
z2$6sn)PFhkt!AaLqAKv{!41YNw6S=b0LmJhOIq2|gZ3S{JIQ|NDTfotm#CGJp~QsW
zNeV#@+hHMcmMv>2Z1GLq6LYU6Jc%RM5F+LG!bEh=W_9ypu*q+QQt*bmo&k^vNTKxw
zZ6((Zxm|V35J3{Sk(3I39b_AhuN}b%zxVl1P#mIkzKoEd?i@*)6Kb6QN3%s)>XRfI
zU@j<LsutQ5F;LiAbdVY%*u&yTOxt<h(7DHvfQ!JZ+K8cr>?DKa(-vo={lLA5OCImz
zX9aNM{F~zBZkC^@W7rwYPWrpkKY+H(lM|qBBie^u5`Y?9hkFsc`}wn5mnuQ4a%8e<
zS>NnY-<a);siA}HNRKnDLPSkY@4*tfByCvLE7vNTe#`c4_Rv!3@r^o+(&SLi+_FB2
z{SCEuXQxs~%z9z%WRo)UuXJ@r4Z7QX-q6xj(O>7Kg2A2i9@XdwUQ(GY1-bRDNVIF`
zYgZc4c1<ShL}rV$>Xl3}74Tw&ae(Fl<2Y6qZD4+oQq%ZLlL@EYz^z*a%(RL6$F=Jp
zIg;G+gO;HeQqUbNfdV&UeNIf6f8z|nMFKsQJBmCxe%TrxjLz6thQ-TkRh!=<z{A*S
z&*BSHLsrvGRR9tFa*A$G<lPD1hO7BZHf;n7KkKGzeBaH`K6W5N1lkGzny{t)RZ+SL
zwU86B#zw-_T}J+pU%3#w-Ahv$me6^xv+P&7ME7_AnE==pQ|n~Nuw7YimIDrO3@way
zbZ;y-39~Dm=rdow6T}%7^ZHpX=5B~)dRcbRM59TUvofPFljgO{dNiiXsVsn6|91HR
zR;>?bFBHXi<PD8!w7hN!wxQSf#$t>*v}($(4OneqU0aB8{jJZDP3Opmux7y0#Iy~J
z(keZ?MN)bR`PS$F%T3zANQpu5b8=)KNK;4)#&9>yzp@8tK4ot!qg>2e@wBDP(4JyH
z&b=AlJev}_233#y!#f$u*U)7Ky%UY76zZ!ij3;WE-40s{&ew<G0+$2|QliomjwU-B
zU)4y*T3;O4&%D6LL5eE_KrN|LiDVgUQpwZ4@8aHTXSMQA$(C&)-Cy1rJ4cql_H{bw
z+!6qL2wM$V_#{Ks_E8t~1h&$)jqiTqo-?c<X()iTD%nh%Z?UljHGEkp03vOQ)RXX%
z7H%vEUO2J7;j4)71!9Y?Q|9(@?A)vIvp#wW%*dL3k@FeyPEB=iDh^-JKr5nONwW0;
z6z6N-o;F8V4~!U3*ooEy>qLmeH6~CA2lZGGBy!0c2$V=93!>Q{BwQR16Vh|n+Ls8T
zY$a^G^jFEnYAc-->A*#LJ=D>tL%F34G~06JX2JVDS!EFw88H;+wc$z4vVifmhT8MU
z?-xtU2QqG623J{Zc!d1$pV<}W&3v6|s!1kuprr|BMvNx_fDZdPuHSl1<t!r^Z^cOG
zFRFo;LOY>CMtqa4xf2ruM*_o})F;rbvqpe)pKqwQWk0%}^Y6>ZuVKEf6wQ0-(asaK
z9-9DK?T(bs?F6Wn6>oY`){v@ktM>Et*moglEs=>20yb7fGtV>jZyclA4|-HPhnL1D
zv*P@~yb;y}sk`^IVu<Enb|tLJ?a^wSe8fwmBiQ%;|7H^#`5K$YqGOcP>+*-{0Qg8@
zbioy_v^Y`c?W&r1MAx(7vuEpP4d;RghX5D#5-g8Y?1wEMLOaPY$L4EJ#ur!y!KmF+
zaDjM(u#t3E)!gT#9l2~=7~7+qx5CAc%4PKMeug<&5Ca?aCbMi#H|49WK78UtF6_8_
z3aL<aN2ci;O))485k+`;<L{G`hq+LDUII6V$|LRyDuI>n>lT+^7$$wFpY>B#NP85<
zr`C{(kC?B&@aK`6Wze~fa%JIm(H?H|6F<EZ?gN#lovmxCl&@{kn+R`<C@n1kI00XE
zU90l%H@NrK4qY&D?sbA|lKTJ*zppn~w5#hqg3ji=ypo0bvzr4xEm{`b>8t{A*;N{e
zLp*V7+$60xA1A(Up0_0i>}z0#-DQ=LR|b4H!;|CWlWZb%DhgmRb)-oY<*Vc6>6d!L
zZtev-tTZu>Qx@-rYH%KB_L<W}XGD5p<==Uc$Ic@`b4?e?3wC0b94UdKj}jjhb+_>v
z0$(*|^8k_-M!UH7xtlbyzn?F9dOl{MT<@s*hBHjvg6Hqv4Ro2P<=yV_=unZU*@5QE
z5s;;=Pj66?wd>(2*_O-Z4?c)G1j#tvB_Pvnrj8XSdDejjoE3djPawf6YD=3I^F*9R
z=h9<O+ERN7ZLwXFR}uF1nS0zRM=bgYkzyXV%{zcoR@tT~z3*4jksI*Z%34-Cl?zk<
zYgRp`R7bt55Xoy%K5PQ!vk*KxG$beuRL+rFuXZ>sqE(#={l`L8LEN>}LDjQsu<Gcm
zR{MT7QwegvtTuQ%l`@o1tk%8!bl(Ym*b!~(TZ*mEC>gIXOE*w|v`9C^m>NPR&V5{!
zsA!vehO-|naSM#)lEC*zzLc4kic7qUB<&m*gq(AIF7_fdl6tlnLueTG?crQ)i>L{2
z56Z8vA58DaDeW!bnJ3;{KELhWeKJ(hy}s?WrY${L$JzCYh}2LScg9L8JF5C9JJODW
zb?N0(I)9h0EX=IthVW^tPv>RfZ+cL1wPaBL?Y;2Nx1qy?*zU95G$R)%;$1!;jXA+?
z@0ViCCF1xMy%S4#y@Ga*Sw64c+V*ElV5YH}v4kA3NeNx`%ycnP_Dn#JM~sy0W{p<O
zn}X-M>K_V!@Fr9Y--_uzuMU4x5YO45Ra<#vi*Qm<iku|&QS|2m4?YYk@dIa7^d|Pj
zHM$edpfh^j>Zhp~=9}TA_hN4}@<Ra7&B{CV&(jv)@{ZfP-o8|08S8H=qNm?r`*WwE
zJ9hT!tFu~uvml<0FlWjQ4m3^_)G%MTkEwiC7v?tnU}yj&EZNkk<Hp5H7JWX4pz;=a
z$=`&2b!&OC`Ai7MD8do6(*wc+2@Tfx-94o-lL)Q$W?S2xZh=jKF_O6c4?;$B55p@c
zA@wAWa7Y={3Tbg-YN9hYOfB@H#^~JDs&MR#>~hc{%8dMzu3*XwgxzFa{sjfH0xuhg
z9qrCX;K%(Cx74}6p6#Qj;xDo9F8b&WhL7a;b8m2B!wBYckixf@(N!x%4MZu+cZ3Zh
z?@9Z&7ne4?BDC*-G|=ml*8W(Rt_vSImV=sOBDcFWX6%;=5CJdsNOI71?Hkw>T~Wt)
zLGGV9I821ZJ_1H<<FZCq-a%TxH9bbVZq)FBW6sw;4+<GsoqvaKEG^0!9Dmds5dhno
z!i#=6x^|p&;uWR08Syf>UyH;Ds8-H$;|YU}BWzKwY^3^5_8=gJ%f33G_h&0=^D*qS
z>*}fXRTpC0on%Jl+M{Z-A)%$HTyhzW5v}tM8|WWt(ReZo!AMzDhtelY*0Qr6`!TkM
zHvgdH2U5rqT4J*t*c*m`4lPr1u--$;es&DkN2d*5pBuSB;9n2Cou_Wjf##uX2u5pI
z1sJtr#{Zy9cM9gZ1}@o{CqP4H;LcO3`723OHf(oVD11JrT~`EM5v4Cb1qHX3u88e7
zsxZ8i!0yKZ#`oI+lL7ix^m~FOTqJ7h6LqTqv0GlFe^8pIA6Zmu--S3QKp`Hlt9%=p
zKI%m>!)rNT&mM7`J;Y#AEI)@q5jNYx^E1tI(Zxpd`L^RtiY}D+K5(s^E)Xi-Zfvl#
zH&?d^=ren$@pu*pd|Hax@uQXt8SSpub1+!G+KyB<1Y~4Y3Fi-`3b2OpqgfZkK|l<$
zoBLO}x88xJXpcn*SoO};N&B!wcp+6R(xwC7Mf)7m^B{*=RBylZbWMO72pgD;_za>@
zL@u<zaxSQI1A|@Nvr*#_6ocRg<iG8KNk)UDim;v_hx#<A+?#AVa&ekPZ$7;dx&8Um
zdm*Fs7M}zLk7fR03DBk&+~cI&IzG>T*sy_Quhr)(Nw1_?7(C9oXgiUEMY4}`?c<7v
zwB0kTVWq!UDtoE1H*-^l-7j0Lk0>ZHu-h?JV>{wQ2QGhdw2#%Tp8s53$4g<ys%@3x
zp0ALFyO|gS0l8u@aO;+NJoA42Ek<Hj4eOim5onlG1JhzJycYVdie2FAYN3f{`8ihw
ztzux>le~fLxjOKhXg+6|0IEios3ybWX~AXK=PRokolFQ$Y?7r&_kM7}@L^rH6h<|+
z6%70WaLH6CD`9Rf0tT{b(M0P4ohn!Bb~U~4RYAS-f*~o%2|bMrQVStc42cW*S@%d8
zhzSJaY(6>meCa>FZy2)C(1j2~%;HA%_jjATVXak@k+LlfiC`WmP^WzckBKLzO^sj1
zzrgT>jYt+o5f<ka%9LG3H$%M~xc4Ix;V~T^^c41T<?p4D;p@z8`3!Hwu~-!BzMP6`
zpZ}uS1W<c-uK*CGe?j`D7WRVgfHpRCWe`hg<7#r;&oXCNBQ6`&!d`kgyH-v$Rqd@W
zVR-k?n)3Uh1P3+9K2nTxJMY=%acWr;Tf}>LuUy_g;AMup!RxjzX^E@TXDql-3UUv3
z>0V0$e7{Tikksv+GcIYCUuSRR8Ybzrpzvg!h|PnFKnH4%SDd=%a%^x(7_<0;q@Qaz
z=NdkWC+o8PF8Rk^g<PAHyCWQ1t6}iE1be?`YQ1Uq;*nom=s<P1;`(Q8!)diJj+Hcg
zo%-WQh^?|koZqM8`2A+g&z?jN%U1QM#)J&`%YYq=#$!6nGqsfbIx~yq_mh@1%yDPH
z%K2!GiEDbP*B`gMg7ST-#yfmQ1Xr{Dgw-A;647xz`yKcwq)Xjd4V!XFJ9l=&WyIsR
z(8|i2-}PONS*+zmWT=E3Bc<7!Pe%?_XjP*kejpA?SZ0@1-@K-B*&^EDcCHab(tHa3
zV?1zs?Dqx@uo7CWpuU>xkqFS19<XE8h}O65Os($A&M)Bn&9s?vHan`}l@`cCwP@qb
zQhvH<t|2h@q|A1frBB#g;*@}f40?SQ?G)zcB;64&^m~^=6pOMv8Dwz|V-68~G<eQh
z4ZAy-U%DER0Uj@~6huP}cW;oasSV6pFchU|YH@D0ZjrG0n|~j6nkUMd-$TzGg~SK<
zYdmRRYrZr>WdsGyms}65p%Axh0KOye{bD-zmzqoYi9-7;$X*NQ6lv_)iJ4;|DEx><
zH2r#*K?`W1yp+sikdFRpxSnRWf%vD-JEhlMx5Q$c#T%}F@}LOir3jB72{7)otw<Cn
zyQQdGaG<#<ZAF5)b5ua4HxDn#2K>!AEbmxWoaeW8k5E}Z^?zZa6^z!(n=S<p6S7)s
zSOT?-AT#I9Hs<MEnCdHWPhA;zrYJojoVVp9{|oLgcQzVeN*b5{KBK2tKS!`sko3i_
zRlOsmo@jW2ZR7A^%2yW~zmB`h$mo4vjG8@Z1kC?z9AK8Xmj6CWMC)evG!NRzFRu`X
z=$LA$HF_eNTZhDBoO8YQ8^7$N?mxnYSmnEpEm)xLSwQ6lK8m!4TW(NY8NDY_3r<EU
zC{KpA>OLpLAKY-5a_sq^7Cxo+A{<`9_C3>Vd&Qg?aTNid1qaS=arO(J#6}0hA-#w+
zZ`og>YofhQNPs=occSql>W}r8t>Xz~zdXIx4^P^^CV#+VcI+-TTRowFdtQ^_w2p?y
zy57Q}g<@{%`n+y?-&dHiAW`x)3O3ZTG3vif8}=ts8ENlLAt2D^Qil^G?-j}gl!WpQ
zh$yplt?b8?&Bye?#vgE?on3chs(66aeZD56T?H=~9R4c*4&a&;^uv?Lzdy=0Ss6^X
z>VJ|p@_OX8SG$CXv(xDDOcO!#*``wIjHY<7Fv(I^pgc)uOjqXt0IP|`H!6*iT&=>G
zNtGip_Yct!>g24y2J{0zd954&B*EzLFq2ZYQ$%yFCA#X14~($Pupp@U{G!^b@9P$`
z)f4zY!lc2e6Fy-ba}qq8=dml*E~)H|Pj9l)1e_?y#6ZICM~z+RufB~i7Z&*CIf|d}
zyNJB8%azL?rZ1t{PrdlNmns*tHrH@Xu5(%s-MXwWLdsVzOC+Ah_T2)jI}xU)O&uR_
zrbxdzd<DGWHsR#_cD13s0Y>D+x(7>~E=x*eb5h*H3<EHb$&+&00*PTBXSE@;)C;Lc
zz8%GO3<ycQEF(X9aMa29cCyqD=3K*FznI1;(yV2{SAMjfc7B4;GCx}SyV+$+F_DpL
zIX`LLBBK|Ez7u;*R9CNDWLs{CqSNyE<>>iB&+G?LX|fR-(W1?P38mzSp>tzpMh4aa
z!#;doIknRK+7Y05<dr>yk-9l4tT}p;6i_1Us!0nJuf6b>kdeJ8dRWe@w76hq{WB8R
zJ@AUCjJvM8%&5sH5UwNOCiMZLH+p69ZWs?K2dtJnV%h^;{JCil>=)>o$vSe{C$8Q=
zE@*<o-LoIX*i}=!(mvOEam)EUAp_}S;s;`5kXmmwoeJFvZhWTC6NZY{c4dtq&=nR*
zpFb<B9NzPNVQK`HTpE(~tY>C!!#2N@_Qv~)208;l?CL>i{piV?mb5s=5)`dZiE5N@
zq<){gC6C2%HjYmfyMkJZzvW<EnIi7MI2e+0Uy1!0$Zy8hX>H$Yb2`@hW+7*cJc!yt
zzsh){zni_nH{>|9go?iUAwvc82c>^U-J;+QrEt{IsGtA<0oT+8sC~}{bC7O?PV^$r
zgzN=<a!gMd@6gn@;l;vf!j|p`Lubm$#OsMYQk67;xW%k@v~qXY5mE-*q@{*Q{udj0
ztov5i*i<q7rdzYUQIgV^gxC5y&r78CyIi{I<1UotS-M+IOV99V2Ur(f(D%K<H31f~
z=%OPz<i(vL#lbAf>Jl0Z&#YMpH>!d{?&kxPk5L#gTJ9YAC|2+idkVt{*ZrLKw$4c9
zjQYgDaf8-v@8_Jh5>Insbiwn!Kh%!EKUscxf9}~aqBF%%cUkn19xh(<b!@c@jGqKB
zi9s$6`(DplSWCbWso5#6jQy4GDhz|vfLixcRfG=1Ae+hABf76GPpNUH0%>~ohW23-
z=bd?7byl||N-ltw-qlA2SZOmzM|jl)zZQ+d*^6V%MtDm{S3PD8yv#lO5r-)ATwV;w
zn2yr*_M_++V<1GLuIYQTwYB$fGh<oUnf!wBMQ1$o%<sd>k8gx3Sy}%m3r4xi7RoKp
zGSOTXJhsuQC~w69OVt~rXLXuyqQ&A?rK#qzYaVCCT6AGL%dRZ6=`r)()gpJ(dH?-Y
zdWEqA0u+*wJ~jB*N;~z|szC@lsD#}PY`%z`0?25o7#QVBvdw;+7KYBr!NV9$_)6E}
zwEIjht4$onp1>a*)fQi~V1Nv|t{J%>LoPptUUw9&RKnWP0-e*u1qS;X)!0%&;T;dO
zYwa{eX3q$31bRfw2EWvYI}KZ%O8;(W>ba7$K+(k)T6*J6HZ9k1lL^9bh^QINbw7Kp
z76g@acqG{kab!7nC|C)81U-g<0A^Om^WeX<ZM9&1S-Ju!y_d{eJ10RUCsNL+-Un8`
zZnOQS(wo6Ptbo!&RTsrfs#F`Jr%IJGAyR{>2A7|qs<pV&PRMsIdYOam>pvBCeaLWH
zL|=?KabCUSjqZxJI;K#YcR)$mgz$O^-7h!r7Mr;0X;CqJJ*M=$`b6PXvxx5&mDsX*
zUW<qK+Kd;<)f?X&6NuF#*8S*xI=^o`jcC|tFy<78{`=C&T>ux>%&PcV-{ZK90*S_k
ze_ph?owRuz%F09|3>XEFOHX^ZOWvByUPd)Xa4<I5oE~`bRm3bNx$4NXDHZR`NN!85
zx;aQ$nex1gYU4Gs=WUt0?{Fy!Cbn0N6q_%ut@%2*1MAW>Z^*hOsEg_S@iRw21fzY-
z<gtAl=-t~VrOIHLZ^5tAh{u-N7omOGTBp$!{5GFmmV80O&xv6->e~gNTIbLZo$kWV
z{4|g2ZxJb;2@mf*a_H<666)J`?rJe~hW>=Uxuaj6D`lOv+?^4(e;st@uuBJD{ue$F
zN-`ad#}bH@CE~x5VK^Xa*1trAWU?S-s0?iJgu-nifvZfvcqRxyA+7CI_wCD7PM}dv
zo`NvHbbAH-K~73zAwheGuD1^JTxATlIBuK|Dr)omZ!<G7T}?LlKJ{YOu+SsRf@_zz
zTN@Pr<Kg;~f2Uj<@KbF6`gSNv)XTBz3H@0E&%p&l(e%2(Gv!W!zH>})_tkEbpw2^I
z^#9Fn7?Cs-Ew;}87Tz#A%!jVfM2?$1pVCjhd!Sl<UJ6dU-Npz2<Yfdl#rKEb3a?}>
z5B~l?52Y+_s^YF}Sv)hs3^#CWEMddmUO9e$hJX>O86!_I#f_=R39+lCXIRk{nYX8*
zPv|988oxPw61lF0xL%zuj%s&%YxNkW-nI2IzAqBsc<W#@DB>8YsVBlEm>zx<iW%kH
z_%lcx;qCi-vM3Eoj`b5yGYioliT@GhYWK1<K@K~2%juwUqMpL?g^OJeZbroXlUkt9
z4j;beB%NbTc{L=ytn^zNHVU;)=N%NNIlxAmQfAe4nYmSP%iy38VRYvq<B}%bx%$c8
zjaCtEwBQ1EJyiA?JKqB2m+yRw^OIY{2bRVCN$Rk`*#@gjoBYtwjW`M_;aNtmU8bTb
zg1=-BLqtb<mFcVY{atu%fNr9i;2lM{pYvQj=PuQ`dtx?A`o5#~?*XhtL!fq3(GVez
zs*W{FDP`M|pY^ReP!W!Y6ce_U{`as*ze8i9ex2%T07I2?lP;HN8s^|%r4mVpon~6H
z`DOTWgUoonZTOfuLxPEuvT3yj=|?8SdW&xGAr6!V79^2NgJr?j?q~l~o2AbOAC?+X
z2y#C>sh<h{E#@DjvWws=&G<Rhk#Sd5ZdpcqJkx<%{<bNgZSD7{lR0#5!xt!+`y=IA
zZA1E@h08yJq-lpq+{WeowG({cHYfU{8^4$YDM!)ksxKB>UGy1yZLys5jn9(8gEf2i
z{85e{_2Nf!t-l##qx(ivijL%B%n$C(Q>G0@NSq#yJTmRLaqEYGIE@oja@;-rT1|uO
zC0azNQw#AoGse)lZBManzmYPzWqF0@u7YrqE*fv;5tsZ<lM1wgG}Zqyc?XkTf0+?*
zSn<{qcYMr5mJ|DnjtOiQbPDJdm$}-wwf1~>bn<fUfy#Ui(dJ$CJPnCG<+45s?w`b5
zNKWXC;e?lrq4Eq0qpuSoVI{*Cu)pRo++%NuHG{sr+zeBlB|g4ZPjk}DEsO2Q#bTgS
zm~bomp+K3pNrQC5S<R-j-(K0o?4tc?_D+z~Skk-kA&J3y$DIk|4)z)U88UKWt5Z_%
zff#C}^tYFe8SeUf1Fd!(FAEx24`c&5lGTmh{L>oEa~QPQsOkQiG3{OfKtHVw#3gBq
zKHsaj_wty_T$Cg;>dgCf$@7De^HayCq~BDUOj>g@D$Oj$#IMwdFW&FNEbRDJS$fdd
zfAN6${Fq(<i0PAehtD|5++_^c*Y>L#GJ@N1^7p;!%2QC)9I}zCsMZI2YR_34p|F0d
zJvk-;u-|284P!mbfT!MPWot*pRhdp6MW9jpr(yflc&FksaLjF^kOy(z`TY%%AzWJ=
zC4l=ww$o0I`dJ3qx>vate$D(5dZ4?_q@iUa#8QL*T;GcPB<ipFB)@^}w8|>aXPz%)
znsl{1a6)WY{)+ytUdN5*VZ>HqQ~NzhPuU5h#!MojAtU_m_I0`oC#|&vOoV7QWN9&`
z!Fkf+1a;vK(qz?UhnrqnxNkSBy&@eD+|nhj*12i6E(#@W)pBORHN|U)%zqkuB(KZP
zc72lzYiPSA-Ib1M*m{$9e5n#B7Yn*)&f^<=FKxs1<->dKioOr;A&haa$wbGP@lo^|
zu{|Tper&j}_U7ntKuqQs+P1`REAu)j)jdwcaS{E|@n<KWZav#pyR74F=};$6eluKI
zdsoN%vcm`}ce(hTr-lFUVy)B-Z#S*b!nTLf7XJ*+{v(%AM+TSFcqaJIq83__uhQUs
zfV<(6kb<d8lU4MKPuvVrQalBkXZk293iYH^nUS+db&o6V=U_IEU4vZyQCtqK?bk6Z
zozlsmGu2n_bTVELp{JE3^lL)O2=!fpm=^()4K*#}_l!a!Gr}un1V()|hf)%jy=w<A
z7~OnjioB1ya`r6o@wj7mA7gIx<+-6`#nSDgK<D+1Az5}1<E0apy_2Ez|2X~p{r@=q
jUtaeANb)|EW^jHS%*jPOF~@ithw17iOB2||+fV)r^TzA$

literal 0
HcmV?d00001

diff --git a/Img/SUB.png b/Img/SUB.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b06f2862a5f1b6c437dfaeae757ad083d9796a0
GIT binary patch
literal 10532
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
Xi0r!9Fv_nVY4o&>ZWR4-FYLbnHQe}5

literal 0
HcmV?d00001

diff --git a/Img/UNCENSORED.png b/Img/UNCENSORED.png
new file mode 100644
index 0000000000000000000000000000000000000000..094e4245e07d7e753579b6863bfea5e23966dce9
GIT binary patch
literal 11067
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
QVyU#%^==gYeJ}X`0DMD87ytkO

literal 0
HcmV?d00001


From e47509c6da9bfa028f366747bad6f27bd9ad66f3 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 11:01:47 +0800
Subject: [PATCH 24/27] Delete test

---
 Img/test | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Img/test

diff --git a/Img/test b/Img/test
deleted file mode 100644
index 83f4927..0000000
--- a/Img/test
+++ /dev/null
@@ -1 +0,0 @@
-12312

From 322e55847f173d54f0600b27313f522dbf3302b5 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 11:19:38 +0800
Subject: [PATCH 25/27] Update core.py

---
 core.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core.py b/core.py
index 0e15157..7223f2a 100755
--- a/core.py
+++ b/core.py
@@ -127,6 +127,11 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
         cover_small = ''
     else:
         cover_small = json_data.get('cover_small')
+    
+    if json_data.get('trailer') == None:
+        trailer = ''
+    else:
+        trailer = json_data.get('trailer')
         
     imagecut = json_data.get('imagecut')
     tag = str(json_data.get('tag')).strip("[ ]").replace("'", '').replace(" ", '').split(',')  # 字符串转列表 @
@@ -217,6 +222,14 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
         translate_values = conf.transalte_values().split(",")
         for translate_value in translate_values:
             json_data[translate_value] = translate(json_data[translate_value])
+            
+    if conf.is_trailer():
+        if trailer:
+            json_data['trailer'] = trailer
+        else:
+            json_data['trailer'] = ''
+    else:
+        json_data['trailer'] = ''
     naming_rule=""
     for i in conf.naming_rule().split("+"):
         if i not in json_data:

From 1c66f775edbca835292b180717f62a35f45605c2 Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 11:32:17 +0800
Subject: [PATCH 26/27] Update core.py

---
 core.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core.py b/core.py
index 7223f2a..6f8edaf 100755
--- a/core.py
+++ b/core.py
@@ -133,6 +133,11 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
     else:
         trailer = json_data.get('trailer')
         
+    if json_data.get('extrafanart') == None:
+        extrafanart = ''
+    else:
+        extrafanart = json_data.get('extrafanart')
+    
     imagecut = json_data.get('imagecut')
     tag = str(json_data.get('tag')).strip("[ ]").replace("'", '').replace(" ", '').split(',')  # 字符串转列表 @
     actor = str(actor_list).strip("[ ]").replace("'", '').replace(" ", '')
@@ -230,6 +235,15 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
             json_data['trailer'] = ''
     else:
         json_data['trailer'] = ''
+        
+    if conf.get_extrafanart():
+        if extrafanart:
+            json_data['extrafanart'] = extrafanart
+        else:
+            json_data['extrafanart'] = ''
+    else:
+        json_data['extrafanart'] = ''
+        
     naming_rule=""
     for i in conf.naming_rule().split("+"):
         if i not in json_data:

From e2db08a02a217df1b9f4e86bc24ddb703a5a4fdb Mon Sep 17 00:00:00 2001
From: Feng4 <wuxiang198@gmail.com>
Date: Sun, 27 Dec 2020 11:34:47 +0800
Subject: [PATCH 27/27] Update core.py

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 6f8edaf..23bc17c 100755
--- a/core.py
+++ b/core.py
@@ -236,7 +236,7 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
     else:
         json_data['trailer'] = ''
         
-    if conf.get_extrafanart():
+    if conf.is_extrafanart():
         if extrafanart:
             json_data['extrafanart'] = extrafanart
         else: