Skip to content

Commit

Permalink
Updated and added test build
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasBrostrom committed Dec 17, 2024
1 parent 9e522d1 commit 6d7df3b
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
11 changes: 11 additions & 0 deletions cavAuxModList_dev.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"workshop": {
"2021778690": {
"name": "TFTW Female Characters",
"url": "https://steamcommunity.com/sharedfiles/filedetails/?id=2021778690",
"requireResigning": false,
"License": "License permits",
"comment": "Adds female faces."
}
}
}
18 changes: 16 additions & 2 deletions scripts/assemble.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ def get_commit_id():


def download_mod_files(complete_mod_list, STEAM_LOGIN, STEAM_PASS, verbose=False):
# Check if password and username is set
if STEAM_LOGIN == "" and STEAM_PASS == "":
print("Warning: No steamcmd username and password provided skipping download")
return
elif STEAM_LOGIN == "":
print("Warning: No steamcmd username provided skipping download")
return
elif STEAM_PASS == "":
print("Warning: No steamcmd password provided skipping download")
return

login_cmd = [
STEAMCMD,
'+force_install_dir', WORKDIR,
Expand Down Expand Up @@ -143,6 +154,7 @@ def main():
parser.add_argument('-p', '--password', type=str)
parser.add_argument('-C', '--config', type=str)
parser.add_argument('-s', '--commit', type=str)
parser.add_argument('-d', '--data', type=str)
parser.add_argument('--verbose', action='store_true')
parser.add_argument('--dryrun', action='store_false')

Expand Down Expand Up @@ -172,8 +184,10 @@ def main():
# Checking required tools
check_required_tools()

providerFile = args.data if args.data else "cavAuxModList.json"

# Obtain list
modListPath = os.path.join(PROJECTROOT, "cavAuxModList.json")
modListPath = os.path.join(PROJECTROOT, providerFile)
try:
modListFile = open(modListPath)
except FileNotFoundError:
Expand Down Expand Up @@ -224,7 +238,7 @@ def main():
allModsExist=True
for expectedMod in modListDict['workshop'].keys():
if not expectedMod in os.listdir(WORKSHOPOUT):
print(f"[Error] {modListDict['workshop'][downloadedMod]['name']} [{downloadedMod}] does not exist or have not download properly")
print(f"[Error] {modListDict['workshop'][expectedMod]['name']} [{expectedMod}] does not exist or have not download properly")
allModsExist=False
else:
print(f"Mod {modListDict['workshop'][expectedMod]['name']} [{expectedMod}] successfully downloaded...") if args.verbose else ""
Expand Down

0 comments on commit 6d7df3b

Please sign in to comment.