Skip to content

Fix asset parsing by applying Regex #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wolfy76700 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix asset parsing by applying Regex #997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/TSHGameAssetManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ def run(self):
for c in self.parent().characters.keys():
self.parent().stockIcons[c] = {}

pattern = re.compile(f'({assetsObj.get("prefix", "")})({self.parent().characters[c].get("codename")})({assetsObj.get("postfix", "")})([0-9]*)\\.([A-Za-z0-9]+)')
filteredFiles = \
[f for f in files if f.startswith(assetsObj.get(
"prefix", "")+self.parent().characters[c].get("codename")+assetsObj.get("postfix", ""))]
[f for f in files if pattern.match(f)]

if len(filteredFiles) == 0:
# Store path only — QImage must be created on the main thread
Expand Down Expand Up @@ -341,9 +341,9 @@ def run(self):
files = sorted(os.listdir(
'./user_data/games/'+game_dir+'/'+assetsKey))

pattern = re.compile(f'({asset.get("prefix", "")})({self.parent().characters[c].get("codename")})({asset.get("postfix", "")})([0-9]*)\\.([A-Za-z0-9]+)')
filteredFiles = \
[f for f in files if f.startswith(asset.get(
"prefix", "")+self.parent().characters[c].get("codename")+asset.get("postfix", ""))]
[f for f in files if pattern.match(f)]

for f in filteredFiles:
numberStart = f.rfind(
Expand Down Expand Up @@ -638,9 +638,9 @@ def run(self, mods_active=False, mods_reload_mode=False):
for c in self.parent.characters.keys():
self.parent.stockIcons[c] = {}

pattern = re.compile(f'({assetsObj.get("prefix", "")})({self.parent().characters[c].get("codename")})({assetsObj.get("postfix", "")})([0-9]*)\\.([A-Za-z0-9]+)')
filteredFiles = \
[f for f in files if f.startswith(assetsObj.get(
"prefix", "")+self.parent.characters[c].get("codename")+assetsObj.get("postfix", ""))]
[f for f in files if pattern.match(f)]

if len(filteredFiles) == 0:
# Store path only — QImage must be created on the main thread
Expand Down Expand Up @@ -677,9 +677,9 @@ def run(self, mods_active=False, mods_reload_mode=False):
files = sorted(os.listdir(
'./user_data/games/'+game_dir+'/'+assetsKey))

pattern = re.compile(f'({asset.get("prefix", "")})({self.parent().characters[c].get("codename")})({asset.get("postfix", "")})([0-9]*)\\.([A-Za-z0-9]+)')
filteredFiles = \
[f for f in files if f.startswith(asset.get(
"prefix", "")+self.parent.characters[c].get("codename")+asset.get("postfix", ""))]
[f for f in files if pattern.match(f)]

for f in filteredFiles:
numberStart = f.rfind(
Expand Down Expand Up @@ -1509,14 +1509,15 @@ def GetCharacterAssets(self, characterCodename: str, skin: int, assetpack: str =

baseName = asset.get(
"prefix", "")+characterCodename+asset.get("postfix", "")
pattern = f"({baseName})([0-9]*)\\.([A-Za-z0-9])"

skinFileList = [f for f in os.listdir(
assetPath) if f.startswith(baseName)]
assetPath) if re.match(pattern, f)]

skinFiles = {}

for f in skinFileList:
skinId = f[len(baseName):].rsplit(".", 1)[0]
skinId = re.search(pattern, f).group(2)
if skinId == "":
skinId = 0
else:
Expand Down