Fixed issues with windows and with existing filenames

This commit is contained in:
Fabrice Quenneville 2020-12-14 00:21:15 -05:00
parent 3ddce45933
commit a77e31d628

View File

@ -5,6 +5,8 @@ from .tools import deletefile, findfreename
import subprocess import subprocess
import os import os
import sys import sys
import re
import colorama import colorama
colorama.init() colorama.init()
@ -140,16 +142,21 @@ class Video():
newfilename = self.filename_origin[:-4] + ".mp4" newfilename = self.filename_origin[:-4] + ".mp4"
if os.path.exists(self.path + newfilename): if os.path.exists(self.path + newfilename):
newfilename = findfreename(self.path + newfilename) newfilename = findfreename(self.path + newfilename)
if os.name == 'nt':
newfilename = str(newfilename)[str(newfilename).rindex("\\") + 1:]
else:
newfilename = str(newfilename)[str(newfilename).rindex("/") + 1:]
else: else:
newfilename = self.filename_origin[:-4] + ".mkv" newfilename = self.filename_origin[:-4] + ".mkv"
if os.path.exists(self.path + newfilename): if os.path.exists(self.path + newfilename):
newfilename = findfreename(self.path + newfilename) newfilename = findfreename(self.path + newfilename)
print(newfilename) if os.name == 'nt':
exit() newfilename = str(newfilename)[str(newfilename).rindex("\\") + 1:]
else:
newfilename = str(newfilename)[str(newfilename).rindex("/") + 1:]
self.filename_tmp = newfilename self.filename_tmp = newfilename
# Settting ffmpeg # Settting ffmpeg
args = ['ffmpeg', '-i', self.path + self.filename_origin] args = ['ffmpeg', '-i', self.path + self.filename_origin]
@ -178,8 +185,7 @@ class Video():
self.filename_tmp = "" self.filename_tmp = ""
exit() exit()
else: else:
print(self.path + self.filename_tmp) os.chmod(f"{self.path}{self.filename_tmp}", 777)
os.chmod(self.path + self.filename_tmp, 777)
self.filename_new = self.filename_tmp self.filename_new = self.filename_tmp
self.filename_tmp = "" self.filename_tmp = ""
return True return True