Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-27 21:54:17 +01:00
Code Issues Projects Releases Wiki Activity

output: fix detection of already downloaded files

Browse Source
This commit is contained in:
Johan Andersson 2018-05-13 01:42:10 +02:00
parent 81011d4b53
commit 335ff16c8c
1 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/svtplay_dl/utils/output.py
View File

@ -156,9 +156,8 @@ def formatname(output, config, extension):
return name return name
def output(output, config, extension="mp4", mode="wb", **kwargs): def output(output, config, extension=".mp4", mode="wb", **kwargs):
# subtitlefiles = ["srt", "smi", "tt", "sami", "wrst"] subtitlefiles = ["srt", "smi", "tt", "sami", "wrst"]
print(output)
name = formatname(output, config, extension) name = formatname(output, config, extension)
if config.get("output") and os.path.isdir(os.path.expanduser(config.get("output"))): if config.get("output") and os.path.isdir(os.path.expanduser(config.get("output"))):
@ -166,56 +165,42 @@ def output(output, config, extension="mp4", mode="wb", **kwargs):
elif config.get("path") and os.path.isdir(os.path.expanduser(config.get("path"))): elif config.get("path") and os.path.isdir(os.path.expanduser(config.get("path"))):
name = os.path.join(os.path.expanduser(config.get("output")), name) name = os.path.join(os.path.expanduser(config.get("output")), name)
filename, ext = os.path.splitext(name)
# ext = re.search(r"(\.\w{2,4})$", options.output)
# if not ext:
# options.output = "%s.%s" % (options.output, extension)
# if options.output_auto and ext:
# options.output = "%s.%s" % (options.output, extension)
# elif extension == "srt" and ext:
# options.output = "%s.srt" % options.output[:options.output.rfind(ext.group(1))]
# if ext and extension == "srt" and ext.group(1).split(".")[-1] in subtitlefiles:
# options.output = "%s.srt" % options.output[:options.output.rfind(ext.group(1))]
logging.info("Outfile: %s", name) logging.info("Outfile: %s", name)
if os.path.isfile(name): if os.path.isfile(name):
logging.warning("File ({}) already exists. Use --force to overwrite".format(name)) logging.warning("File ({}) already exists. Use --force to overwrite".format(name))
return None return None
# if os.path.isfile(name) or \ if findexpisode(output, os.path.dirname(os.path.realpath(name)), os.path.basename(name)):
# findexpisode(os.path.dirname(os.path.realpath(name)), options.service, os.path.basename(options.output)): if extension in subtitlefiles:
# if extension in subtitlefiles: if not config.get("force_subtitle"):
# if not options.force_subtitle: if not (config.get("silent") or config.get("silent_semi")):
# if not (options.silent or options.silent_semi): logging.warning("File ({}) already exists. Use --force-subtitle to overwrite".format(name))
# logging.warning("File (%s) already exists. Use --force-subtitle to overwrite" % options.output) return None
# return None else:
# else: if not config.get("force"):
# if not options.force: print()
# if not (options.silent or options.silent_semi): if not (config.get("silent") or config.get("silent_semi")):
# logging.warning("File (%s) already exists. Use --force to overwrite" % options.output) logging.warning("File ({}) already exists. Use --force to overwrite".format(name))
# return None return None
file_d = open(name, mode, **kwargs) file_d = open(name, mode, **kwargs)
return file_d return file_d
def findexpisode(directory, service, name): def findexpisode(output, directory, name):
subtitlefiles = ["srt", "smi", "tt", "sami", "wrst"] subtitlefiles = ["srt", "smi", "tt", "sami", "wrst"]
match = re.search(r"-(\w+)-\w+.(\w{2,3})$", name)
if not match:
return False
videoid = match.group(1) orgname, orgext = os.path.splitext(name)
extension = match.group(2)
files = [f for f in os.listdir(directory) if os.path.isfile(os.path.join(directory, f))] files = [f for f in os.listdir(directory) if os.path.isfile(os.path.join(directory, f))]
for i in files: for i in files:
match = re.search(r"-(\w+)-\w+.(\w{2,3})$", i) lsname, lsext = os.path.splitext(i)
if match: if output["service"]:
if service: if orgext[1:] in subtitlefiles:
if extension in subtitlefiles: if name.find(output["service"]) > 0 and lsname.find(output["service"]) > 0 and \
if name.find(service) and match.group(1) == videoid and match.group(2) == extension: name.find(output["id"]) > 0 and lsname.find(output["id"]) > 0 and \
return True orgext == lsext:
elif match.group(2) not in subtitlefiles and match.group(2) != "m4a": return True
if name.find(service) and match.group(1) == videoid: elif lsext[1:] not in subtitlefiles and lsext[1:] not in ["m4a"]:
return True if name.find(output["service"]) > 0 and lsname.find(output["id"]) > 0:
return True
return False return False