From b906be8099bb62a0b350381e81b665ec73e37b6a Mon Sep 17 00:00:00 2001 From: hejianjun Date: Sun, 6 Nov 2022 20:27:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=83=E7=94=A891mv,=E6=8D=A2=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=BD=91=E7=AB=99javday?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scrapinglib/api.py | 8 ++-- scrapinglib/javday.py | 43 ++++++++++++++++++++ scrapinglib/mv91.py | 94 ------------------------------------------- 3 files changed, 47 insertions(+), 98 deletions(-) create mode 100644 scrapinglib/javday.py delete mode 100644 scrapinglib/mv91.py diff --git a/scrapinglib/api.py b/scrapinglib/api.py index 3cd8917..83116ee 100644 --- a/scrapinglib/api.py +++ b/scrapinglib/api.py @@ -11,7 +11,6 @@ from .gcolle import Gcolle from .getchu import Getchu from .jav321 import Jav321 from .javdb import Javdb -from .mv91 import Mv91 from .fc2 import Fc2 from .madou import Madou from .mgstage import Mgstage @@ -19,6 +18,7 @@ from .javbus import Javbus from .xcity import Xcity from .avsox import Avsox from .javlibrary import Javlibrary +from .javday import Javday from .tmdb import Tmdb from .imdb import Imdb @@ -50,8 +50,8 @@ class Scraping: """ """ adult_full_sources = ['javlibrary', 'javdb', 'javbus', 'airav', 'fanza', 'xcity', 'jav321', - 'mgstage', 'fc2', 'avsox', 'dlsite', 'carib', 'madou', 'mv91', - 'getchu', 'gcolle' + 'mgstage', 'fc2', 'avsox', 'dlsite', 'carib', 'madou', + 'getchu', 'gcolle','javday' ] adult_func_mapping = { 'avsox': Avsox().scrape, @@ -65,11 +65,11 @@ class Scraping: 'fanza': Fanza().scrape, 'airav': Airav().scrape, 'carib': Carib().scrape, - 'mv91': Mv91().scrape, 'gcolle': Gcolle().scrape, 'javdb': Javdb().scrape, 'getchu': Getchu().scrape, 'javlibrary': Javlibrary().scrape, + 'javday': Javday().scrape } general_full_sources = ['tmdb', 'imdb'] diff --git a/scrapinglib/javday.py b/scrapinglib/javday.py new file mode 100644 index 0000000..01ecc09 --- /dev/null +++ b/scrapinglib/javday.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- + +import re +from lxml import etree +from urllib.parse import urlparse, unquote +from .parser import Parser + + +class Javday(Parser): + source = 'javday' + + expr_url = '/html/head/meta[@property="og:url"]/@content' + expr_cover = '/html/head/meta[@property="og:image"]/@content' + expr_tags = '/html/head/meta[@name="keywords"]/@content' + expr_title = "/html/head/title/text()" + expr_actor = "//span[@class='vod_actor']/a/text()" + expr_studio = '//span[@class="producer"]/a/text()' + expr_number = '//span[@class="jpnum"]/text()' + + def extraInit(self): + self.imagecut = 4 + self.uncensored = True + + def search(self, number): + self.number = number.strip().upper() + if self.specifiedUrl: + self.detailurl = self.specifiedUrl + else: + self.detailurl = "https://javday.tv/videos/" + self.number.replace("-","") + "/" + self.htmlcode = self.getHtml(self.detailurl) + if self.htmlcode == 404: + return 404 + htmltree = etree.fromstring(self.htmlcode, etree.HTMLParser()) + self.detailurl = self.getTreeElement(htmltree, self.expr_url) + + result = self.dictformat(htmltree) + return result + + def getTitle(self, htmltree): + title = super().getTitle(htmltree) + # 删除番号和网站名 + result = title.replace(self.number,"").replace("- JAVDAY.TV","").strip() + return result diff --git a/scrapinglib/mv91.py b/scrapinglib/mv91.py deleted file mode 100644 index 65a7f7e..0000000 --- a/scrapinglib/mv91.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- - - -import re -from lxml import etree -from .parser import Parser - - -class Mv91(Parser): - source = 'mv91' - - expr_number = '//div[@class="player-title"]/text()' - expr_title = '//div[@class="player-title"]/text()' - expr_release = '//p[@class="date"]/text()' - expr_outline = '//div[@class="play-text"]/text()' - expr_tags = '//div[@class="player-tag"]/text()' - expr_actor = '//p[@class="player-name"]/text()' - - def extraInit(self): - self.imagecut = 0 - self.uncensored = True - - def getHtmlTree(self, url, type=None): - self.htmlcode = self.getHtml(url, type) - if self.htmlcode == 404: - return 404 - ret = etree.fromstring(self.htmlcode, etree.HTMLParser()) - return ret - - def queryNumberUrl(self, number): - keyword = number.replace('91CM-','').replace('91MS-','') - search_html = self.getHtml('https://www.91mv.org/index/search?keywords=' + keyword) - html = etree.fromstring(search_html, etree.HTMLParser()) - endurl = html.xpath('//a[@class="video-list"]/@href')[0] - return 'https://www.91mv.org' + endurl - - def getNum(self, htmltree): - try: - num = super().getNum(htmltree) - finds = re.findall('(.*)(91.*-\d*)',num) - if finds: - result = str(finds[0][1]) - else: - result = ' '.join(num.replace('/',' ').split()) - result = result.split()[1] - if self.number.upper() != result.upper(): - raise Exception(f'[!] {self.number}: find {result} in mv91, not match') - return result.strip() - except: - return '' - - def getTitle(self, htmltree): - try: - title = super().getTitle(htmltree) - finds = re.findall('(.*)(91.*-\d*)',title) - if finds: - result = str(finds[0][0]) - else: - result = ' '.join(title.replace('/',' ').split()) - result = result.split()[0] - return result.replace('「预告」','').strip('/ ') - except: - return '' - - def getStudio(self, htmltree): - return '91制片厂' - - def getActors(self, htmltree): - b=[] - for player in self.getTreeAll(htmltree, self.expr_actor): - player = player.replace('主演：','') - if '/' in player: - player = player.split('/')[0] - player = re.sub(r'[0-9]+', '', player) - b.append(player) - return b - - def getRelease(self, htmltree): - try: - result = super().getRelease(htmltree) - date = result.replace('日期：','') - if isinstance(date, str) and len(date): - return date - except: - pass - return '' - - def getCover(self, htmltree): - try: - url = str(re.findall('var pic_url = "(.*?)"', self.htmlcode)[0]) - return url.strip() - except: - return '' - From df47ded85939aac765b32f8e52fc5f6ea0e35394 Mon Sep 17 00:00:00 2001 From: chaow Date: Sun, 6 Nov 2022 12:01:56 -0800 Subject: [PATCH 2/5] =?UTF-8?q?Change=20=E6=B5=81=E5=87=BA=20tag=20to=20?= =?UTF-8?q?=E6=97=A0=E7=A0=81=E6=B5=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core.py b/core.py index 56783e1..96297d5 100644 --- a/core.py +++ b/core.py @@ -367,7 +367,7 @@ def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, f if cn_sub == '1': print(" 中文字幕", file=code) if liuchu == '流出': - print(" 流出", file=code) + print(" 无码流出", file=code) if uncensored == 1: print(" 无码", file=code) if hack_word != '': @@ -381,7 +381,7 @@ def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, f if cn_sub == '1': print(" 中文字幕", file=code) if liuchu == '流出': - print(" 流出", file=code) + print(" 无码流出", file=code) if uncensored == 1: print(" 无码", file=code) if hack_word != '': @@ -465,7 +465,7 @@ def add_mark(poster_path, thumb_path, cn_sub, leak, uncensored, hack) -> None: if cn_sub: mark_type += ',字幕' if leak: - mark_type += ',流出' + mark_type += ',无码流出' if uncensored: mark_type += ',无码' if hack: @@ -721,7 +721,7 @@ def core_main_no_net_op(movie_path, number): c_word = '-C' # 中文字幕影片后缀 uncensored = 1 if is_uncensored(number) else 0 if '流出' in movie_path or 'uncensored' in movie_path.lower(): - leak_word = '-流出' # 流出影片后缀 + leak_word = '-无码流出' # 无码流出影片后缀 leak = 1 if 'hack'.upper() in str(movie_path).upper() or '破解' in movie_path: @@ -806,7 +806,7 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N if '流出' in movie_path or 'uncensored' in movie_path.lower(): liuchu = '流出' leak = 1 - leak_word = '-流出' # 流出影片后缀 + leak_word = '-无码流出' # 流出影片后缀 else: leak = 0 From d6d8bd6ebfd8ab89868d4ba5e1d2d3526febc65a Mon Sep 17 00:00:00 2001 From: Marks Date: Sun, 6 Nov 2022 13:49:12 -0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9Bmapping?= =?UTF-8?q?=5Finfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MappingTable/mapping_info.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/MappingTable/mapping_info.xml b/MappingTable/mapping_info.xml index abc5977..c80c39c 100644 --- a/MappingTable/mapping_info.xml +++ b/MappingTable/mapping_info.xml @@ -45,12 +45,13 @@ zh_cn/zh_tw/jp：指对应语言输出的词，按设置的对应语言输出。 + + - @@ -115,8 +116,7 @@ zh_cn/zh_tw/jp：指对应语言输出的词，按设置的对应语言输出。 - - + @@ -133,7 +133,7 @@ zh_cn/zh_tw/jp：指对应语言输出的词，按设置的对应语言输出。 - + @@ -268,7 +268,6 @@ zh_cn/zh_tw/jp：指对应语言输出的词，按设置的对应语言输出。 - @@ -290,7 +289,7 @@ zh_cn/zh_tw/jp：指对应语言输出的词，按设置的对应语言输出。 - + From e064c1a7f7fbdc953ed78fe4256dd81d1da0579f Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Tue, 15 Nov 2022 23:55:44 +0800 Subject: [PATCH 4/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a2df48e..aacc688 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ [English](https://github.com/yoshiko2/Movie_Data_Capture/blob/master/README_EN.md) +## 广告位招租 yoshiko2.dev@gmail.com + # 文档 * [官方教程WIKI](https://github.com/yoshiko2/Movie_Data_Capture/wiki) * [VergilGao's Docker部署](https://github.com/VergilGao/docker-mdc) From e84d75a50af96ba4d60b69a054335c49d65386b1 Mon Sep 17 00:00:00 2001 From: Wayne Lui Date: Tue, 22 Nov 2022 17:14:57 +0800 Subject: [PATCH 5/5] Add get-video-properties in requirements.txt & fix some codes --- core.py | 94 +++++++++++++++++++++++++++--------------------- requirements.txt | 1 + 2 files changed, 54 insertions(+), 41 deletions(-) diff --git a/core.py b/core.py index 11bd392..ec683eb 100644 --- a/core.py +++ b/core.py @@ -84,14 +84,15 @@ def small_cover_check(path, filename, cover_small, movie_path, json_headers=None def create_folder(json_data): # 创建文件夹 - title, studio, year, outline, runtime, director, actor_photo, release, number, cover, trailer, 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) conf = config.getInstance() success_folder = conf.success_folder() actor = json_data.get('actor') location_rule = eval(conf.location_rule(), json_data) if 'actor' in conf.location_rule() and len(actor) > 100: print(conf.location_rule()) - location_rule = eval(conf.location_rule().replace("actor","'多人作品'"), json_data) + location_rule = eval(conf.location_rule().replace("actor", "'多人作品'"), json_data) maxlen = conf.max_title_len() if 'title' in conf.location_rule() and len(title) > maxlen: shorttitle = title[0:maxlen] @@ -129,7 +130,7 @@ def download_file_with_filename(url, filename, path, filepath, json_headers=None except: print(f"[-]Fatal error! Can not make folder '{path}'") os._exit(0) - r = get_html(url=url,return_type='content',json_headers=json_headers) + r = get_html(url=url, return_type='content', json_headers=json_headers) if r == '': print('[-]Movie Download Data not found!') return @@ -144,20 +145,22 @@ def download_file_with_filename(url, filename, path, filepath, json_headers=None # moveFailedFolder(filepath) # return except Exception as e: - print('[-]Image Download :Error',e) + print('[-]Image Download :Error', e) print('[-]Connect Failed! Please check your Proxy or Network!') moveFailedFolder(filepath) return def trailer_download(trailer, leak_word, c_word, hack_word, number, path, filepath): - if download_file_with_filename(trailer, number + leak_word + c_word + hack_word + '-trailer.mp4', path, filepath) == 'failed': + if download_file_with_filename(trailer, number + leak_word + c_word + hack_word + '-trailer.mp4', path, + filepath) == 'failed': return configProxy = config.getInstance().proxy() for i in range(configProxy.retry): - if file_not_exist_or_empty(path+'/' + number + leak_word + c_word + hack_word + '-trailer.mp4'): + if file_not_exist_or_empty(path + '/' + number + leak_word + c_word + hack_word + '-trailer.mp4'): print('[!]Video Download Failed! Trying again. [{}/3]', i + 1) - download_file_with_filename(trailer, number + leak_word + c_word + hack_word + '-trailer.mp4', path, filepath) + download_file_with_filename(trailer, number + leak_word + c_word + hack_word + '-trailer.mp4', path, + filepath) continue else: break @@ -181,7 +184,7 @@ def actor_photo_download(actors, save_dir, number): if not res: continue ext = res.group(1) - pic_fullpath = actors_dir / f'{actor_name}{ext}' + pic_fullpath = actors_dir / f'{actor_name}{ext}' if download_only_missing_images and not file_not_exist_or_empty(pic_fullpath): continue dn_list.append((url, pic_fullpath)) @@ -196,8 +199,9 @@ def actor_photo_download(actors, save_dir, number): if not r: failed += 1 print(f"[-]Actor photo '{dn_list[i][0]}' to '{dn_list[i][1]}' download failed!") - if failed: # 非致命错误，电影不移入失败文件夹，将来可以用模式3补齐 - print(f"[-]Failed downloaded {failed}/{len(result)} actor photo for [{number}] to '{actors_dir}', you may retry run mode 3 later.") + if failed: # 非致命错误，电影不移入失败文件夹，将来可以用模式3补齐 + print( + f"[-]Failed downloaded {failed}/{len(result)} actor photo for [{number}] to '{actors_dir}', you may retry run mode 3 later.") else: print(f"[+]Successfully downloaded {len(result)} actor photo.") @@ -239,14 +243,14 @@ def extrafanart_download_one_by_one(data, path, filepath, json_data=None): print(f'[!]Extrafanart download one by one mode runtime {time.perf_counter() - tm_start:.3f}s') -def extrafanart_download_threadpool(url_list, save_dir, number,json_data=None): +def extrafanart_download_threadpool(url_list, save_dir, number, json_data=None): tm_start = time.perf_counter() conf = config.getInstance() extrafanart_dir = Path(save_dir) / conf.get_extrafanart() download_only_missing_images = conf.download_only_missing_images() dn_list = [] for i, url in enumerate(url_list, start=1): - jpg_fullpath = extrafanart_dir / f'extrafanart-{i}.jpg' + jpg_fullpath = extrafanart_dir / f'extrafanart-{i}.jpg' if download_only_missing_images and not file_not_exist_or_empty(jpg_fullpath): continue dn_list.append((url, jpg_fullpath)) @@ -261,8 +265,9 @@ def extrafanart_download_threadpool(url_list, save_dir, number,json_data=None): if not r: failed += 1 print(f'[-]Extrafanart {i} for [{number}] download failed!') - if failed: # 非致命错误，电影不移入失败文件夹，将来可以用模式3补齐 - print(f"[-]Failed downloaded {failed}/{len(result)} extrafanart images for [{number}] to '{extrafanart_dir}', you may retry run mode 3 later.") + if failed: # 非致命错误，电影不移入失败文件夹，将来可以用模式3补齐 + print( + f"[-]Failed downloaded {failed}/{len(result)} extrafanart images for [{number}] to '{extrafanart_dir}', you may retry run mode 3 later.") else: print(f"[+]Successfully downloaded {len(result)} extrafanarts.") if conf.debug(): @@ -307,12 +312,14 @@ def image_download(cover, fanart_path, thumb_path, path, filepath, json_headers= shutil.copyfile(full_filepath, os.path.join(path, thumb_path)) -def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, filepath, tag, actor_list, liuchu, uncensored, hack_word,_4k,fanart_path,poster_path,thumb_path): - title, studio, year, outline, runtime, director, actor_photo, release, number, cover, trailer, website, series, label = get_info(json_data) +def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, filepath, tag, actor_list, liuchu, + uncensored, hack_word, _4k, fanart_path, poster_path, thumb_path): + title, studio, year, outline, runtime, director, actor_photo, release, number, cover, trailer, website, series, label = get_info( + json_data) if config.getInstance().main_mode() == 3: # 模式3下，由于视频文件不做任何改变，.nfo文件必须和视频文件名称除后缀外完全一致，KODI等软件方可支持 nfo_path = str(Path(filepath).with_suffix('.nfo')) else: - nfo_path = os.path.join(path,f"{number}{part}{leak_word}{c_word}{hack_word}.nfo") + nfo_path = os.path.join(path, f"{number}{part}{leak_word}{c_word}{hack_word}.nfo") try: if not os.path.exists(path): try: @@ -350,7 +357,7 @@ def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, f print(" " + director + "", file=code) print(" " + poster_path + "", file=code) print(" " + thumb_path + "", file=code) - print(" " + fanart_path + "", file=code) + print(" " + fanart_path + "", file=code) try: for key in actor_list: print(" ", file=code) @@ -524,7 +531,7 @@ def add_to_pic(pic_path, img_pic, size, count, mode): else: mark_pic_path = BytesIO( get_html("https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/" + pngpath, - return_type="content")) + return_type="content")) 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) @@ -539,6 +546,8 @@ def add_to_pic(pic_path, img_pic, size, count, mode): ] img_pic.paste(img_subt, (pos[count]['x'], pos[count]['y']), mask=a) img_pic.save(pic_path, quality=95) + + # ========================结束================================= @@ -600,7 +609,8 @@ def paste_file_to_folder(filepath, path, multi_part, number, part, leak_word, c_ return -def paste_file_to_folder_mode2(filepath, path, multi_part, number, part, leak_word, c_word, hack_word): # 文件路径，番号，后缀，要移动至的位置 +def paste_file_to_folder_mode2(filepath, path, multi_part, number, part, leak_word, c_word, + hack_word): # 文件路径，番号，后缀，要移动至的位置 if multi_part == 1: number += part # 这时number会被附加上CD1后缀 filepath_obj = pathlib.Path(filepath) @@ -720,12 +730,12 @@ def core_main_no_net_op(movie_path, number): part = re.findall('[-_]CD\d+', movie_path, re.IGNORECASE)[0].upper() multi = True if re.search(r'[-_]C(\.\w+$|-\w+)|\d+ch(\.\w+$|-\w+)', movie_path, - re.I) or '中文' in movie_path or '字幕' in movie_path or ".chs" in movie_path or '.cht' in movie_path: + re.I) or '中文' in movie_path or '字幕' in movie_path or ".chs" in movie_path or '.cht' in movie_path: cn_sub = '1' c_word = '-C' # 中文字幕影片后缀 uncensored = 1 if is_uncensored(number) else 0 if '流出' in movie_path or 'uncensored' in movie_path.lower(): - leak_word = '-无码流出' # 无码流出影片后缀 + leak_word = '-无码流出' # 无码流出影片后缀 leak = 1 if 'hack'.upper() in str(movie_path).upper() or '破解' in movie_path: @@ -745,9 +755,9 @@ def core_main_no_net_op(movie_path, number): return else: return - fanart_path = f"{prestr}-fanart{ext}" + fanart_path = f"{prestr}-fanart{ext}" poster_path = f"{prestr}-poster{ext}" - thumb_path = f"{prestr}-thumb{ext}" + thumb_path = f"{prestr}-thumb{ext}" full_fanart_path = os.path.join(path, fanart_path) full_poster_path = os.path.join(path, poster_path) full_thumb_path = os.path.join(path, thumb_path) @@ -794,14 +804,14 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N # but paste_file_to_folder() still use the input raw search id # so the solution is: use the normalized search id number = json_data["number"] - imagecut = json_data.get('imagecut') - tag = json_data.get('tag') + imagecut = json_data.get('imagecut') + tag = json_data.get('tag') # =======================================================================判断-C,-CD后缀 if re.search('[-_]CD\d+', movie_path, re.IGNORECASE): multi_part = 1 part = re.findall('[-_]CD\d+', movie_path, re.IGNORECASE)[0].upper() if re.search(r'[-_]C(\.\w+$|-\w+)|\d+ch(\.\w+$|-\w+)', movie_path, - re.I) or '中文' in movie_path or '字幕' in movie_path: + re.I) or '中文' in movie_path or '字幕' in movie_path: cn_sub = '1' c_word = '-C' # 中文字幕影片后缀 @@ -812,18 +822,19 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N if '流出' in movie_path or 'uncensored' in movie_path.lower(): liuchu = '流出' leak = 1 - leak_word = '-无码流出' # 流出影片后缀 + leak_word = '-无码流出' # 流出影片后缀 else: leak = 0 if 'hack'.upper() in str(movie_path).upper() or '破解' in movie_path: hack = 1 hack_word = "-hack" - + # 判断是否4k - if '4K' in tag: tag.remove('4K') # 从tag中移除'4K' + if '4K' in tag: + tag.remove('4K') # 从tag中移除'4K' props = get_video_properties(movie_path) # 判断是否为4K视频 - if props['width'] >=4096 or props['height'] >= 2160: + if props['width'] >= 4096 or props['height'] >= 2160: _4k = '4k' _4k_world = '-4k' @@ -832,14 +843,13 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N debug_print(json_data) # 创建文件夹 - #path = create_folder(rootpath + '/' + conf.success_folder(), json_data.get('location_rule'), json_data) - + # path = create_folder(rootpath + '/' + conf.success_folder(), json_data.get('location_rule'), json_data) cover = json_data.get('cover') ext = image_ext(cover) - fanart_path = f"{number}{leak_word}{c_word}{hack_word}-fanart{ext}" + fanart_path = f"{number}{leak_word}{c_word}{hack_word}-fanart{ext}" poster_path = f"{number}{leak_word}{c_word}{hack_word}-poster{ext}" - thumb_path = f"{number}{leak_word}{c_word}{hack_word}-thumb{ext}" + thumb_path = f"{number}{leak_word}{c_word}{hack_word}-thumb{ext}" # main_mode # 1: 刮削模式 / Scraping mode # 2: 整理模式 / Organizing mode @@ -887,7 +897,7 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N # 添加水印 if conf.is_watermark(): - add_mark(os.path.join(path,poster_path), os.path.join(path,thumb_path), cn_sub, leak, uncensored, hack) + add_mark(os.path.join(path, poster_path), os.path.join(path, thumb_path), cn_sub, leak, uncensored, hack) # 兼容Jellyfin封面图文件名规则 if multi_part and conf.jellyfin_multi_part_fanart(): @@ -897,8 +907,9 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N paste_file_to_folder(movie_path, path, multi_part, number, part, leak_word, c_word, hack_word) # 最后输出.nfo元数据文件，以完成.nfo文件创建作为任务成功标志 - print_files(path, leak_word, c_word, json_data.get('naming_rule'), part, cn_sub, json_data, movie_path, tag, json_data.get('actor_list'), liuchu, uncensored, hack_word - ,_4k,fanart_path,poster_path,thumb_path) + print_files(path, leak_word, c_word, json_data.get('naming_rule'), part, cn_sub, json_data, movie_path, tag, + json_data.get('actor_list'), liuchu, uncensored, hack_word + , _4k, fanart_path, poster_path, thumb_path) elif conf.main_mode() == 2: # 创建文件夹 @@ -906,7 +917,7 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N # 移动文件 paste_file_to_folder_mode2(movie_path, path, multi_part, number, part, leak_word, c_word, hack_word) if conf.is_watermark(): - add_mark(os.path.join(path,poster_path), os.path.join(path,thumb_path), cn_sub, leak, uncensored, hack) + add_mark(os.path.join(path, poster_path), os.path.join(path, thumb_path), cn_sub, leak, uncensored, hack) elif conf.main_mode() == 3: path = str(Path(movie_path).parent) @@ -950,7 +961,7 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N # 添加水印 if conf.is_watermark(): - add_mark(os.path.join(path,poster_path), os.path.join(path,thumb_path), cn_sub, leak, uncensored, hack) + add_mark(os.path.join(path, poster_path), os.path.join(path, thumb_path), cn_sub, leak, uncensored, hack) # 兼容Jellyfin封面图文件名规则 if multi_part and conf.jellyfin_multi_part_fanart(): @@ -958,4 +969,5 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N # 最后输出.nfo元数据文件，以完成.nfo文件创建作为任务成功标志 print_files(path, leak_word, c_word, json_data.get('naming_rule'), part, cn_sub, json_data, movie_path, - tag, json_data.get('actor_list'), liuchu, uncensored, hack_word,fanart_path,poster_path,thumb_path) + tag, json_data.get('actor_list'), liuchu, uncensored, hack_word, fanart_path, poster_path, + thumb_path) diff --git a/requirements.txt b/requirements.txt index 9b7e77e..9781404 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,4 @@ certifi MechanicalSoup opencc-python-reimplemented face_recognition +get-video-properties