additional creators and authors, better handling

Author: psi29a

Manifests/UIXR.manifest

@@ -103,12 +103,62 @@ Aleanne, Cait, Rhedd and Ren collectively used the following which falls under C
     additional permission as long as the above credits and contact information
     are included.
 
-Redtreespirit said the following of Nomad's work which falls under the CC-BY-SA:
+Redtreespirit said the following of Nomad's work which falls under CC-BY-SA:
 
     Nomad is no longer reachable, so you're welcome to contact me with any questions.
     All meshes and textures by Nomad.
     My OKs: You are welcome to use the meshes in any Morrowind or TESCS project.
 
+Tom “Neuman” Oldani of Better Bodies has placed his work under CC-BY-SA:
+
+    Generally, I've given anyone who asks permission to use our assets, provided 
+    they say somewhere in the documentation where the assets came from.  
+    If that's what you're asking, then sure, feel free to use them. 
+
+Gorg & Arathrax (DarkSharp) of Better Heads used the following which falls under the CC-BY-SA license:
+
+    YES you can "reuse", "remake", "redistribute" etc some, all or any part of this mod. 
+    Gorg and Arathrax have asked only 2 things.
+	    * First that you give Gorg and Arathrax and any of the original texture artists credit 
+	      in your readme
+	    * Second that if you alter any models in any way that you change the name of the model, 
+	      if you use it exactly as is please leave the name as is. 
+	      (Same request that Rhedd made concerning the reuse of his stuff)
+	      
+    Textures artists:	      
+        Allerleirauh, Wormgod, Don Salus, Hellkitty, Eternum, Nomad, Mantodea, Sheikizza, 
+        Astarsis, Zuldazug, Noviere, Silaria, CanadianIce, Motoki, Arathrax, and Gorg
+
+Emma and Robert (Grumpy) have released their work which fall under the CC-BY license:
+     
+    My meshes and textures can be used freely without any conditions, only if it's modyfied 
+    the file names should be changed to avoid overwriting issues.
+    
+    Heads - You may use these heads in your mods without asking for further permission.
+
+Korana & Semtex who furthered Neuman, Gorg and DarkSharp's work under the CC-BY license:
+
+    Feel free to use any of these items in other projects! Permission is not needed, 
+    but I do appreciate a message letting me know...as I get tickled pink when I see 
+    any of my projects in use in other projects!  Please, make sure you give the appropriate 
+    creators credit as well...and give me credit for anything of mine you used.
+
+Steve "Dongle" Deffeyes wrote the following which falls under the CC-BY license:
+
+    You are free to use this in any Morrowind project you wish. Asking ahead is not
+    necessary. Giving credit is not necessary, although you are welcome to if you wish.
+    
+    If you wish to modify this in any way, ie edit the mesh or the texturing, you
+    may do so. Please credit yourself with the final product and not me. Also please
+    change the filenames to avoid conflicts with mods that use the unaltered files.
+
+Razhkul's work falls under the CC-BY license:
+
+    The dragons models and all the scripts except the dragon riding
+    script are freely distributable, you can use them in your mod, the
+    only thing I ask is that you inform me about its use and please, not use
+    the dragons excessively.
+
 ## People we are looking to make contact with
 
 If you have any information leading to the following people, please create a ticket and we can

Manifests/jarvik.manifest

@@ -51,20 +51,17 @@ def worker(work_queue, done_queue):
     spinner = spinning_cursor()
     p = current_process()
     for nif_path in iter(work_queue.get, 'STOP'):
-        sys.stdout.write("\033[K")
-        sys.stdout.write(next(spinner))
-        sys.stdout.write(" [{0}][{1}][{2}]".format(work_queue.qsize(), p.name, nif_path))
+        sys.stdout.write("\r\b\033[K{0} [{1}][{2}][{3}]".format(
+            next(spinner), work_queue.qsize(), p.name, nif_path))
         sys.stdout.flush()
-        sys.stdout.write('\r\b')
         assets = []
         try:
             # assets.append('DEADBEEF')
             assets = retrieve_assets_from_nif(nif_path)
         except Exception:
             pass
-        done_queue.put((p.name, nif_path, assets))
+        done_queue.put((nif_path, assets))
     done_queue.put('STOP')
-    print("{} finished.".format(p.name))
     return True
 
 
@@ -75,6 +72,7 @@ def main():
         spinner = spinning_cursor()
         manifest = []
         additional_assets = []
+        additional_assets_nif = {}
 
         # setup multi-processing job
         workers = 8
@@ -86,11 +84,8 @@ def main():
         for row in uixr_data:
             row_license = row.get('license').lower()
             if row_license == 'cc0' or row_license == 'cc-by' or row_license == 'cc-by-nc':
-                sys.stdout.write("\033[K")
-                sys.stdout.write(next(spinner))
-                sys.stdout.write(" [{0}]".format(row.get('asset')))
+                sys.stdout.write("\r\b \033[K{0} [{1}]".format(next(spinner), row.get('asset')))
                 sys.stdout.flush()
-                sys.stdout.write('\r\b')
                 file_path = os.path.join(ASSET_PATH, row.get('asset'))
                 if not os.path.exists(file_path):
                     print("WARNING: asset not found -> {0}".format(row.get('asset')))
@@ -101,14 +96,13 @@ def main():
                 work_queue.put(file_path)
 
         # let multiprocessing parse the nifs
-        print("Parsing NIFs for additional sub-assets: ")
+        print("\n\nParsing NIFs for additional sub-assets: ")
         for i in range(workers):
             p = Process(target=worker, args=(work_queue, done_queue))
             processes.append(p)
             work_queue.put('STOP')
             p.start()
 
-        print("Building assets to validate.")
         stops = 0
         while True:
             item = done_queue.get()
@@ -118,10 +112,11 @@ def main():
                     break
             else:
                 # for worker_name, nif_name, nif_assets in iter(done_queue.get, 'STOP'):
-                _, _, nif_assets = item
+                nif_path, nif_assets = item
                 additional_assets += nif_assets
+                additional_assets_nif[nif_path] = nif_assets
 
-        print("Filtering assets.")
+        print("\n\nFiltering assets.")
         # remove duplicates
         additional_assets = set(additional_assets)
 
@@ -135,9 +130,19 @@ def main():
             if filename in additional_assets:
                 additional_assets.remove(filename)
 
-        print("Gathering sub-assets: ")
+        # match assets back to NIF
+        additional_assets = list(additional_assets)
+        for i in range(len(additional_assets)):
+            asset = additional_assets[i]
+            nifs_found = []
+            for nif, assets in additional_assets_nif.items():
+                if asset in assets:
+                    nifs_found.append(nif)
+            additional_assets[i] = (asset, [nif.replace(ASSET_PATH, '') for nif in nifs_found])
+
+        print("\n\nGathering sub-assets: ")
         # iterate through all sub assets
-        for nif_asset in additional_assets:
+        for nif_asset, nifs in additional_assets:
             found = False
             na_filename, _ = os.path.splitext(nif_asset.lower())
             na_filename += '.*'
@@ -147,11 +152,8 @@ def main():
                 relative_asset_path = os.path.relpath(os.path.realpath(asset_path), ASSET_PATH)
                 if relative_asset_path in tar_ball.getnames():
                     break  # file already exists, skip
-                sys.stdout.write("\033[K")
-                sys.stdout.write(next(spinner))
-                sys.stdout.write(" [{0}]".format(relative_asset_path))
+                sys.stdout.write("\r\b\033[K{0} [{1}]".format(next(spinner), relative_asset_path))
                 sys.stdout.flush()
-                sys.stdout.write('\r\b')
                 f.seek(0)   # reset to beginning of csv file
                 for row in uixr_data:
                     if find_match(row.get('asset'), relative_asset_path):
@@ -163,12 +165,10 @@ def main():
                         elif row_license == 'cc-by-nc':
                             break  # good to go, break
                         else:
-                            print("WARNING: Non-CC license asset -> {0}".format(relative_asset_path))
-                            found = False
-                tar_ball.add(asset_path, relative_asset_path)
+                            print("\nWARNING: Non-CC license asset -> {0} ({1})\n".format(
+                                relative_asset_path, nifs))
             if not found:
-                print("WARNING: sub-asset not found -> {0}".format(nif_asset))
-
+                print("\nWARNING: sub-asset not found -> {0} ({1})\n".format(nif_asset, nifs))
         tar_ball.close()
 
 

README.md

@@ -65,7 +65,7 @@ def walk_nif(nif_path, use_stdout=True):
             if use_stdout:
                 print(assets_string, sep=', ', end='\n', file=stdout, flush=True)
         except ValueError as ex:
-            print(" Error with {0}: {1}".format(stream.name, str(ex.args)), sep='', end='\n', file=stdout, flush=True)
+            print("\n Error with {0}: {1}".format(stream.name, str(ex.args)), sep='', end='\n', file=stdout, flush=True)
         except Exception as ex:
             print(ex)
             raise

make_release.py

@@ -22,10 +22,14 @@
 with open("Manifests/vurt.manifest", 'r') as content_file:
     vurt_md5 = content_file.read()
 
+jarvik_md5 = None
+with open("Manifests/jarvik.manifest", 'r') as content_file:
+    jarvik_md5 = content_file.read()
+
 
 def validate(md5_list):
     print("\nComparing md5sum of UIX:R to the other files.")
-    beth_counter = starboi_counter = vurt_counter = 0
+    beth_counter = starboi_counter = vurt_counter = jarvik_counter = 0
     for line in md5_list.split('\n'):
         if len(line) > 0:
             md5, rest = line.split(",", 1)
@@ -44,13 +48,17 @@ def validate(md5_list):
             if md5 in vurt_md5:
                 vurt_counter += 1
                 print("{0},{1},Found in Vurt's work".format(md5, rest))
+            if md5 in jarvik_md5:
+                jarvik_counter += 1
+                print("{0},{1},Found in Jarvik bsa".format(md5, rest))
 
     print("""\
 Out of {0} files, found:
   {1} bethesda files
   {2} starboi files
-  {3} vurt files""".format(
-        len(md5_list.split('\n'))-1, beth_counter, starboi_counter, vurt_counter))
+  {3} vurt files
+  {4} jarvik files""".format(
+        len(md5_list.split('\n'))-1, beth_counter, starboi_counter, vurt_counter, jarvik_counter))
 
 
 # uixr files