Fix some path issues

wwiser/wgenerator.py

@@ -131,7 +131,7 @@ def generate(self):
 
         except Exception: # as e
             logging.warn("generator: PROCESS ERROR! (report)")
-            #logging.exception("")
+            logging.exception("")
             raise
         return
 
@@ -351,8 +351,12 @@ def _move_wem(self, node):
         if self._txtpcache.wemsubdir:
             dir += source.subdir()
 
+
+        in_dir = node.get_root().get_path()
+        out_dir = in_dir
         if dir:
-            os.makedirs(dir, exist_ok=True)
+            out_dir = os.path.join(out_dir, dir)
+            os.makedirs(out_dir, exist_ok=True)
 
         in_extension = source.extension
         out_extension = source.extension
@@ -361,7 +365,11 @@ def _move_wem(self, node):
             out_extension = source.extension_alt
 
         in_name = "%s.%s" % (source.tid, in_extension)
-        out_name = "%s%s.%s" % (dir, source.tid, out_extension)
+        in_name = os.path.join(in_dir, in_name)
+        in_name = os.path.normpath(in_name)
+        out_name = "%s.%s" % (source.tid, out_extension)
+        out_name = os.path.join(out_dir, out_name)
+        out_name = os.path.normpath(out_name)
 
         if os.path.exists(out_name):
             logging.info("generator: cannot move %s (exists on output folder)" % (in_name))
@@ -370,11 +378,13 @@ def _move_wem(self, node):
         if not os.path.exists(in_name):
             if self._txtpcache.alt_exts:
                 in_name = "%s.%s" % (source.tid, source.extension_alt)
+                in_name = os.path.join(in_dir, in_name)
+                in_name = os.path.normpath(in_name)
                 if not os.path.exists(in_name):
-                    logging.info("generator: cannot move %s (file not found not found)" % (in_name))
+                    logging.info("generator: cannot move %s (file not found)" % (in_name))
                     return
             else:
-                logging.info("generator: cannot move %s (file not found not found)" % (in_name))
+                logging.info("generator: cannot move %s (file not found)" % (in_name))
                 return
 
         #todo: with alt-exts maybe could keep case, ex .OGG to .LOGG (how?)

wwiser/wgui.py

@@ -243,13 +243,15 @@ def _load_banks_start(self):
                 return
             filenames = []
             for filename in os.listdir(dirname):
-                if not filename.endswith('.bnk') or not os.path.isfile(filename):
+                pathname = os.path.join(dirname, filename)
+                if not filename.endswith('.bnk') or not os.path.isfile(pathname):
                     continue
-                filenames.append(os.path.join(dirname,filename))
+                filenames.append(pathname)
         else:
             filenames = filedialog.askopenfilenames(filetypes = (("Wwise bank files","*.bnk"),("All files","*.*")))
-            if not filenames:
-                return
+
+        if not filenames:
+            return
 
         self.parser.set_ignore_version( self._fields['ignore_version'].get() )
         loaded_filenames = self.parser.parse_banks(filenames)

wwiser/wnames.py

@@ -205,6 +205,8 @@ def _add_name(self, id, name, objpath=None, path=None, onrepeat=ONREPEAT_INCLUDE
     # *************************************
 
     def parse_files(self, filenames, xml=None, txt=None, h=None, lst=None, db=None):
+        if not filenames:
+            return
 
         # parse files for a single bank
         for filename in filenames:
@@ -222,7 +224,7 @@ def parse_files(self, filenames, xml=None, txt=None, h=None, lst=None, db=None):
             self._add_name(None, base_bankname, source=NameRow.NAME_SOURCE_EXTRA)
 
         # extra files, after other banks or priority when generating some missing lists and stuff is off
-        pathfiles = [filenames[0]] #todo fix for multiple paths in filenames, for now asummes one
+        pathfiles = [filenames[0]] #todo fix for multiple paths in filenames, for now assumes one
         for pathfile in pathfiles:
             self.set_bankname(pathfile)
 

wwiser/wtxtp.py

@@ -315,9 +315,7 @@ def write(self):
 
         if outdir:
             basepath = self._node.get_root().get_path()
-            if basepath and not basepath.endswith('/'):
-                basepath = basepath + '/'
-            outdir = basepath + outdir
+            outdir = os.path.join(basepath, outdir)
             os.makedirs(outdir, exist_ok=True)
         for rpl in ['*','?',':','<','>','|']: #'\\','/'
             name = name.replace(rpl, "_")

wwiser/wversion.py

@@ -1,2 +1,2 @@
  #autogenerated on build
-WWISER_VERSION = "v20201024"
+WWISER_VERSION = "v20201026"