Skip to content

Commit 2f71cd2

Browse files
committed
move nif.assets, update manifest with additional cc0 assets from spyder and make_release too finalization
1 parent 9df319a commit 2f71cd2

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

Manifests/UIXR.manifest

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17225,8 +17225,8 @@ af4e578628b6dad741f1434a1bec31f5,UIX/UIX FILES/Data Files/Textures/DON_B_N_Redg_
1722517225
0739d806d7e2ad5640e0e55b8085dada,UIX/UIX FILES/Data Files/Textures/DON_B_N_Redg_M_Head4b.dds, ,
1722617226
c0e9138189eb7a71eda35dec8e9828ed,UIX/UIX FILES/Data Files/Textures/DON_B_N_Redg_M_Head4c.dds, ,
1722717227
7aeabdccc10302ed30a49993f84498fd,UIX/UIX FILES/Data Files/Textures/DON_B_N_Redg_M_Head5b.dds, ,
17228-
5d21e4e12e5de2fe88252736d3779b2f,UIX/UIX FILES/Data Files/Textures/door01.dds, ,
17229-
cb68166aa6e4c387b8aea6330d463e32,UIX/UIX FILES/Data Files/Textures/door2.dds, ,
17228+
5d21e4e12e5de2fe88252736d3779b2f,UIX/UIX FILES/Data Files/Textures/door01.dds,by Spyder,CC0
17229+
cb68166aa6e4c387b8aea6330d463e32,UIX/UIX FILES/Data Files/Textures/door2.dds,by Spyder,CC0
1723017230
e8187245ad0e70cb993b35e9b0b26910,UIX/UIX FILES/Data Files/Textures/dooriron01.dds,by Spyder,CC0
1723117231
717a95db41cf7b25fc73b0b0e94d0945,UIX/UIX FILES/Data Files/Textures/doorwood01.dds,by Spyder,CC0
1723217232
57fb9462c7b2058d769bb42017e5179c,UIX/UIX FILES/Data Files/Textures/DR_bark01_ayse.dds, ,
@@ -17751,9 +17751,9 @@ b4830f147d671f8d27df584a82549181,UIX/UIX FILES/Data Files/Textures/Gguarskin hid
1775117751
269ca30fe86bbfbc04da69135b6327b6,UIX/UIX FILES/Data Files/Textures/gold01.dds,by Spyder,CC0
1775217752
b7752e3a7af4ac93dc36a1325bb0694b,UIX/UIX FILES/Data Files/Textures/gold02.dds,by Spyder,CC0
1775317753
3f10bfb454c094a0ebf46c85f9d1a016,UIX/UIX FILES/Data Files/Textures/gold03.dds,by Spyder,CC0
17754-
030f003f31471d40e650f1e937b668ee,UIX/UIX FILES/Data Files/Textures/goldm1.dds, ,
17755-
54581f5bbaadf3d5df596f8b692f0d24,UIX/UIX FILES/Data Files/Textures/goldm2.dds, ,
17756-
043c34b4b5f9bf10746454e18f74b7d0,UIX/UIX FILES/Data Files/Textures/goldM3.dds, ,
17754+
030f003f31471d40e650f1e937b668ee,UIX/UIX FILES/Data Files/Textures/goldm1.dds,by Spyder,CC0
17755+
54581f5bbaadf3d5df596f8b692f0d24,UIX/UIX FILES/Data Files/Textures/goldm2.dds,by Spyder,CC0
17756+
043c34b4b5f9bf10746454e18f74b7d0,UIX/UIX FILES/Data Files/Textures/goldM3.dds,by Spyder,CC0
1775717757
d15907466adb97fdf718b6e262ba8f53,UIX/UIX FILES/Data Files/Textures/gore_arm.dds,by Spyder,CC0
1775817758
6f9d14bf9ad91aa4e3e108a5e02f9b6d,UIX/UIX FILES/Data Files/Textures/gore_blood.dds,by Spyder,CC0
1775917759
2e8d36c4c50b23318000685acbb5e94b,UIX/UIX FILES/Data Files/Textures/gore_flesh.dds,by Spyder,CC0
@@ -18536,7 +18536,7 @@ f855780520eaaba03ea8a1bb7c4ce726,UIX/UIX FILES/Data Files/Textures/PillBase02.dd
1853618536
bdad9b740190e7294d8f8694fb7781a4,UIX/UIX FILES/Data Files/Textures/PO_Skeleton_hipbone.dds, ,
1853718537
55eb9577739b29ce1aa8b7bfb1ba7477,UIX/UIX FILES/Data Files/Textures/po_skeleton_radiusnm.dds, ,
1853818538
4a41b194cbdbae675d15bcb822f7e147,UIX/UIX FILES/Data Files/Textures/Pomegranate.dds,by Spyder,CC0
18539-
95613750073855a5c2292791f0fa08f0,UIX/UIX FILES/Data Files/Textures/Pomegranate2.dds, ,
18539+
95613750073855a5c2292791f0fa08f0,UIX/UIX FILES/Data Files/Textures/Pomegranate2.dds,by Spyder,CC0
1854018540
6c0a4629f2d614a8e6c5df5ca9229515,UIX/UIX FILES/Data Files/Textures/pot_marble_01.dds,by Spyder,CC0
1854118541
da60fd685b6c61243716190e78dfd334,UIX/UIX FILES/Data Files/Textures/pot_soil_01.dds,by Spyder,CC0
1854218542
1ff37d099647d3163cd51e2aae636f65,UIX/UIX FILES/Data Files/Textures/Potion_Blue.dds, ,
File renamed without changes.

make_release.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,17 @@ def get_filename(string):
2020
return os.path.basename(string.replace("\\", "/"))
2121

2222

23+
def insensitive_glob(pattern, recursive):
24+
def either(c):
25+
return '[%s%s]' % (c.lower(), c.upper()) if c.isalpha() else c
26+
return glob.iglob(''.join(map(either, pattern)), recursive=recursive)
27+
28+
2329
with open("Manifests/UIXR.manifest") as f:
2430
uixr_data = csv.DictReader(f)
2531
tar_ball = tarfile.open(RELEASE_PATH, "w:")
2632
spinner = spinning_cursor()
33+
manifest = []
2734
additional_assets = []
2835
print("Gathering assets: ")
2936
for row in uixr_data:
@@ -34,6 +41,11 @@ def get_filename(string):
3441
sys.stdout.flush()
3542
sys.stdout.write('\r\b')
3643
file_path = os.path.join(ASSET_PATH, row.get('asset'))
44+
if not os.path.exists(file_path):
45+
print("WARNING: asset not found -> {0}".format(row.get('asset')))
46+
continue
47+
48+
manifest.append(row.get('asset'))
3749
tar_ball.add(file_path, row.get('asset'))
3850

3951
# check that we have all related assets
@@ -42,18 +54,25 @@ def get_filename(string):
4254
for asset in asset_string.split(', '):
4355
additional_assets.append(get_filename(asset))
4456

57+
# remove duplicates
4558
additional_assets = set(additional_assets)
4659

4760
# remove blank entry in set
4861
if '' in additional_assets:
4962
additional_assets.remove('')
5063

64+
# remove files listed in manifest, we already have them
65+
for asset in manifest:
66+
filename = os.path.basename(asset)
67+
if filename in additional_assets:
68+
additional_assets.remove(filename)
69+
5170
print("Gathering sub-assets: ")
5271
# iterate through all sub assets
5372
for nif_asset in additional_assets:
5473
found = False
55-
for asset_path in glob.iglob(os.path.join(ASSET_PATH, "UIX", "**", nif_asset),
56-
recursive=True):
74+
glob_path = os.path.join(ASSET_PATH, "UIX", "**", nif_asset)
75+
for asset_path in insensitive_glob(glob_path, True):
5776
found = True
5877
relative_asset_path = os.path.relpath(os.path.realpath(asset_path), ASSET_PATH)
5978
if relative_asset_path in tar_ball.getnames():

0 commit comments

Comments
 (0)