Revert "修正封面读取失败,增加路径escape字符,powershell预处理"
This commit is contained in:
parent
5fe2874892
commit
566a5658b9
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import glob
|
import glob
|
||||||
@ -10,7 +10,6 @@ from ADC_function import *
|
|||||||
import json
|
import json
|
||||||
import shutil
|
import shutil
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
import fnmatch
|
|
||||||
os.chdir(os.getcwd())
|
os.chdir(os.getcwd())
|
||||||
|
|
||||||
# ============global var===========
|
# ============global var===========
|
||||||
@ -19,28 +18,11 @@ version='1.3'
|
|||||||
|
|
||||||
config = ConfigParser()
|
config = ConfigParser()
|
||||||
config.read(config_file, encoding='UTF-8')
|
config.read(config_file, encoding='UTF-8')
|
||||||
fromPath=config['movie']['path']
|
|
||||||
Platform = sys.platform
|
Platform = sys.platform
|
||||||
|
|
||||||
# ==========global var end=========
|
# ==========global var end=========
|
||||||
|
|
||||||
def moveMovies(fromPath):
|
|
||||||
movieFiles = []
|
|
||||||
if Platform == 'win32':
|
|
||||||
movieFormat = ["avi", "rmvb", "wmv", "mov", "mp4", "mkv", "flv", "ts"]
|
|
||||||
else:
|
|
||||||
movieFormat = ["AVI", "RMVB", "WMV", "MOV", "MP4", "MKV", "FLV", "TS","avi", "rmvb", "wmv", "mov", "mp4", "mkv", "flv", "ts"]
|
|
||||||
for fm in movieFormat:
|
|
||||||
movieFiles = movieFiles + [os.path.join(dirpath, f)
|
|
||||||
for dirpath, dirnames, files in os.walk(fromPath)
|
|
||||||
for f in fnmatch.filter(files, '*.' + fm)]
|
|
||||||
for movie in movieFiles:
|
|
||||||
movieName = movie.split('/')[-1]
|
|
||||||
print("Move file " + movieName)
|
|
||||||
if (os.path.exists(os.path.curdir + '/' + movieName)):
|
|
||||||
print(movieName + "exists, skip.")
|
|
||||||
else:
|
|
||||||
shutil.move(movie, os.path.curdir)
|
|
||||||
def UpdateCheck():
|
def UpdateCheck():
|
||||||
if UpdateCheckSwitch() == '1':
|
if UpdateCheckSwitch() == '1':
|
||||||
html2 = get_html('https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/update_check.json')
|
html2 = get_html('https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/update_check.json')
|
||||||
@ -146,7 +128,6 @@ if __name__ =='__main__':
|
|||||||
print('[*]=====================================')
|
print('[*]=====================================')
|
||||||
CreatFailedFolder()
|
CreatFailedFolder()
|
||||||
UpdateCheck()
|
UpdateCheck()
|
||||||
moveMovies(fromPath)
|
|
||||||
os.chdir(os.getcwd())
|
os.chdir(os.getcwd())
|
||||||
|
|
||||||
count = 0
|
count = 0
|
||||||
|
@ -4,8 +4,7 @@ failed_output_folder=failed
|
|||||||
success_output_folder=JAV_output
|
success_output_folder=JAV_output
|
||||||
|
|
||||||
[proxy]
|
[proxy]
|
||||||
proxy=10.168.1.254:3128
|
proxy=127.0.0.1:1080
|
||||||
#proxy=127.0.0.1:1080
|
|
||||||
timeout=10
|
timeout=10
|
||||||
retry=3
|
retry=3
|
||||||
|
|
||||||
@ -22,9 +21,3 @@ media_warehouse=emby
|
|||||||
|
|
||||||
[directory_capture]
|
[directory_capture]
|
||||||
directory=
|
directory=
|
||||||
|
|
||||||
[escape]
|
|
||||||
literals=\()
|
|
||||||
|
|
||||||
[movie]
|
|
||||||
path=/root/sort/test
|
|
||||||
|
Loading…
Reference in New Issue
Block a user