diff --git a/README.md b/README.md index 55bbcc6..232d4f9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # tmdb-person -![Version](https://img.shields.io/badge/version-1.0.2-blue) +![Version](https://img.shields.io/badge/version-1.0.4-blue) ![Python](https://img.shields.io/badge/Python-3.9-green) ![TMDB](https://img.shields.io/badge/TMDB-V3-orign) ![https://blog.cnkj.site](https://img.shields.io/badge/Blog-blog.cnkj.site-blue) @@ -66,7 +66,7 @@ pip3 install -r requirements.txt * scrape: 刮削模式.从扫描目录直接识别nfo文件并刮削元数据和图片到输出目录中 * collect: 转移模式.从扫描目录收集所有nfo文件并复制到输出目录中(不执行刮削操作) * redo: 重做模式.执行正常刮削数据中出现的异常进行重新处理 - * check: 检查模式.检查指定路径下的全部文件夹中演员元数据`person.nfo` 和 演员图片`folder.jpg` 是否存在并分别记录到 [no_nfo_tmdb_ids.txt](no_nfo_tmdb_ids.txt) 和 [no_image_tmdb_ids.txt](no_image_tmdb_ids.txt) 日志文件中 + * check: 检查模式.检查指定路径下的全部文件夹中演员元数据`person.nfo` 和 演员图片`folder.jpg` 是否存在并分别记录到 [no_nfo_tmdb_ids.txt](./check/no_nfo_tmdb_ids.txt) 和 [no_image_tmdb_ids.txt](./check/no_image_tmdb_ids.txt) 日志文件中 * `scan_path` 扫描目录路径使用 `__output` 路径 **`目录结构说明`** diff --git a/error_tmdb_ids.txt b/error_tmdb_ids.txt deleted file mode 100644 index e69de29..0000000 diff --git a/main.py b/main.py index 098168b..3baf93b 100644 --- a/main.py +++ b/main.py @@ -3,9 +3,9 @@ import os import sys -from collect_metadata import __collect_nfo -from redo import __redo,__check -from scrape import __execute +from utils.collect_metadata import __collect_nfo +from utils.redo import __redo,__check +from utils.scrape import __execute from utils.LoggerUtil import Logger diff --git a/analyze.py b/utils/analyze.py similarity index 100% rename from analyze.py rename to utils/analyze.py diff --git a/collect_metadata.py b/utils/collect_metadata.py similarity index 100% rename from collect_metadata.py rename to utils/collect_metadata.py diff --git a/redo.py b/utils/redo.py similarity index 85% rename from redo.py rename to utils/redo.py index 46c951f..08b6ba5 100644 --- a/redo.py +++ b/utils/redo.py @@ -43,10 +43,14 @@ def __redo(log, output, tmdb_token, language="zh-CN"): def __check(scan_path="data/metadata/person"): - os.remove("./no_nfo_tmdb_ids.txt") - os.remove("./no_image_tmdb_ids.txt") - error_file_nfo = open("./no_nfo_tmdb_ids.txt", "w+") - error_file_image = open("./no_image_tmdb_ids.txt", "w+") + no_nfo_tmdb_ids = "../check/no_nfo_tmdb_ids.txt" + no_image_tmdb_ids = "../check/no_image_tmdb_ids.txt" + if os.path.exists(no_nfo_tmdb_ids): + os.remove(no_nfo_tmdb_ids) + if os.path.exists(no_image_tmdb_ids): + os.remove(no_image_tmdb_ids) + error_file_nfo = open(no_nfo_tmdb_ids, "w+") + error_file_image = open(no_image_tmdb_ids, "w+") for i in os.listdir(scan_path): for files in os.listdir(os.path.join(scan_path, i)): if "person.nfo" not in os.listdir(os.path.join(scan_path, i, files)): diff --git a/scrape.py b/utils/scrape.py similarity index 100% rename from scrape.py rename to utils/scrape.py diff --git a/tmdb.py b/utils/tmdb.py similarity index 99% rename from tmdb.py rename to utils/tmdb.py index 82cd11d..6f3d01a 100644 --- a/tmdb.py +++ b/utils/tmdb.py @@ -1,11 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import logging import requests import json import os -from analyze import Make +from utils.analyze import Make import utils.DateUtil as DateUtil # https://api.tmdb.org