diff --git a/src/devede/dvdauthor_converter.py b/src/devede/dvdauthor_converter.py index 24be80f..295b30c 100644 --- a/src/devede/dvdauthor_converter.py +++ b/src/devede/dvdauthor_converter.py @@ -28,15 +28,17 @@ class dvdauthor_converter(devede.executor.executor): devede.executor.executor.__init__(self) self.config = devede.configuration_data.configuration.get_config() + def create_dvd_project (self, path, name, file_movies, menu_entries, start_with_menu): - xml_file = self.create_dvdauthor_xml(path, file_movies, menu_entries, start_with_menu) - - movie_path = os.path.join(path,name) + movie_path = os.path.join(path,"dvd_tree") try: os.makedirs(movie_path) except: pass + + xml_file = self.create_dvdauthor_xml(path, file_movies, menu_entries, start_with_menu) + self.command_var=[] self.command_var.append("dvdauthor") self.command_var.append("-o") @@ -50,6 +52,7 @@ class dvdauthor_converter(devede.executor.executor): def process_stdout(self,data): return + def process_stderr(self,data): if (data != None) and (data[0] != ""): self.progress_bar[1].set_text(data[0]) @@ -65,10 +68,6 @@ class dvdauthor_converter(devede.executor.executor): os.makedirs(xmlpath) except: pass - try: - os.makedirs(datapath) - except: - pass if (len(file_movies) == 1) and (menu_entries == None): onlyone = True @@ -424,6 +423,7 @@ class dvdauthor_converter(devede.executor.executor): return xml_file_path + def return_time(self,seconds,empty): """ cuts a time in seconds into seconds, minutes and hours """ diff --git a/src/devede/genisoimage.py b/src/devede/genisoimage.py index 8ac5fbf..bd81720 100644 --- a/src/devede/genisoimage.py +++ b/src/devede/genisoimage.py @@ -51,7 +51,7 @@ class genisoimage(devede.executor.executor): def create_iso (self, path, name): - filesystem_path = os.path.join(path,name) + filesystem_path = os.path.join(path,"dvd_tree") final_path = os.path.join(path,name+".iso") self.command_var=[] diff --git a/src/devede/mkisofs.py b/src/devede/mkisofs.py index 976b6a1..939eb16 100644 --- a/src/devede/mkisofs.py +++ b/src/devede/mkisofs.py @@ -51,7 +51,7 @@ class mkisofs(devede.executor.executor): def create_iso (self, path, name): - filesystem_path = os.path.join(path,name) + filesystem_path = os.path.join(path,"dvd_tree") final_path = os.path.join(path,name+".iso") self.command_var=[] diff --git a/src/devede/project.py b/src/devede/project.py index 3d69872..d9fd0ff 100644 --- a/src/devede/project.py +++ b/src/devede/project.py @@ -414,11 +414,9 @@ class devede_project: if retval: # delete only the bare minimun needed shutil.rmtree(os.path.join(data.path,"dvd_tree"),True) - print("Delete "+str(os.path.join(data.path,"dvd_tree"))) shutil.rmtree(os.path.join(data.path,"menu"),True) shutil.rmtree(os.path.join(data.path,"movies"),True) shutil.rmtree(os.path.join(data.path,"xml_data"),True) - shutil.rmtree(os.path.join(data.path,data.name),True) if self.config.disc_type == "dvd": try: os.unlink(os.path.join(data.path,data.name+".iso"))