3232import logging
3333from ffcuesplitter .cuesplitter import FFCueSplitter
3434from ffcuesplitter .exceptions import FFCueSplitterError
35+ from ffcuesplitter .utils import remove_source_file
3536
3637
3738class FileSystemOperations (FFCueSplitter ):
@@ -61,7 +62,7 @@ class FileSystemOperations(FFCueSplitter):
6162 """
6263 # ----------------------------------------------------------------#
6364
64- def remove_source_file (self ):
65+ def del_orig_files (self ):
6566 """
6667 Remove the CUE file and the original audio file
6768 from the filesystem. If either one is missing, no
@@ -70,18 +71,12 @@ def remove_source_file(self):
7071 """
7172 cuef = self .kwargs ['filename' ]
7273 audf = self .audiosource
73- exist = False
74- if os .path .exists (cuef ) and os .path .exists (audf ):
75- if os .path .isfile (cuef ) and os .path .isfile (audf ):
76- exist = True
77- logging .info ("Deleting CUE file: '%s'" , cuef )
78- os .remove (cuef )
79- logging .info ("Deleting audio source file: '%s'" , audf )
80- os .remove (audf )
81- if not exist :
74+ ret = remove_source_file (cuef , audf )
75+ if ret is True :
76+ logging .info ("Deleting CUE file: '%s'" , cuef )
77+ logging .info ("Deleting audio source file: '%s'" , audf )
78+ else :
8279 logging .warning ("File deletion failed, source files are missing" )
83- return exist
84- return exist
8580 # ----------------------------------------------------------------#
8681
8782 def dry_run_mode (self ):
@@ -205,7 +200,8 @@ def work_on_temporary_directory(self):
205200 self .move_files_to_outputdir ()
206201 # remove source file if `del_orig_files` argument is given.
207202 if self .kwargs ['del_orig_files' ]:
208- self .remove_source_file ()
203+ #self.remove_source_file()
204+ self .del_orig_files ()
209205# ------------------------------------------------------------------------
210206
211207
0 commit comments