Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace _print_log with logger

Browse Source
This commit is contained in:
Zedifus 2023-04-14 21:48:26 +01:00
parent 4bc3d90b1e
commit 0e60480a8f
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/classes/steamcmd/steamcmd.py
View File

@ -4,10 +4,12 @@ import zipfile
import tarfile import tarfile
import subprocess import subprocess
import urllib.request import urllib.request
import logging
from getpass import getpass from getpass import getpass
from app.classes.steamcmd.steamcmd_command import SteamCMDcommand from app.classes.steamcmd.steamcmd_command import SteamCMDcommand
logger = logging.getLogger(__name__)
package_links = { package_links = {
"Windows": { "Windows": {
@ -108,20 +110,20 @@ class SteamCMD:
os.remove(self.zip) os.remove(self.zip)
@staticmethod # @staticmethod
def _print_log(*message): # def _print_log(*message):
""" # """
Small helper function for printing log entries. # Small helper function for printing log entries.
Helps with output of subprocess.check_call not always having newlines # Helps with output of subprocess.check_call not always having newlines
:param *message: Accepts multiple messages, each will be printed on a # :param *message: Accepts multiple messages, each will be printed on a
new line # new line
""" # """
# TODO: Handle logs better # # TODO: Handle logs better
print("") # print("")
print("") # print("")
for msg in message: # for msg in message:
print(msg) # print(msg)
print("") # print("")
def install(self, force: bool = False): def install(self, force: bool = False):
""" """
@ -143,15 +145,10 @@ class SteamCMD:
subprocess.check_call((self.exe, "+quit")) subprocess.check_call((self.exe, "+quit"))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if e.returncode == 7: if e.returncode == 7:
self._print_log( logger.error(
"SteamCMD has returned error code 7 on fresh installation", "SteamCMD has returned error code 7 on fresh installation",
"",
"Not sure why this crashed,",
"long live steamcmd and it's non existent documentation..",
"It should be fine nevertheless",
) )
return return
else:
raise SystemError( raise SystemError(
message=f"Failed to install, check error code {e.returncode}" message=f"Failed to install, check error code {e.returncode}"
) from e ) from e
@ -193,7 +190,7 @@ class SteamCMD:
if install_dir: if install_dir:
steam_command.force_install_dir(install_dir) steam_command.force_install_dir(install_dir)
steam_command.app_update(app_id, validate, beta, betapassword) steam_command.app_update(app_id, validate, beta, betapassword)
self._print_log( logger.debug(
f"Downloading item {app_id}", f"Downloading item {app_id}",
f"into {install_dir} with validate set to {validate}", f"into {install_dir} with validate set to {validate}",
) )
@ -245,7 +242,7 @@ class SteamCMD:
cmd.get_cmd(), cmd.get_cmd(),
"+quit", "+quit",
) )
self._print_log("Parameters used:", " ".join(params)) logger.debug("Parameters used: ".join(params))
try: try:
return subprocess.check_call(" ".join(params), shell=True) return subprocess.check_call(" ".join(params), shell=True)
@ -253,7 +250,7 @@ class SteamCMD:
# SteamCMD has a habit of timing out large downloads, # SteamCMD has a habit of timing out large downloads,
# so retry on timeout for the remainder of n_tries. # so retry on timeout for the remainder of n_tries.
if e.returncode == 10: if e.returncode == 10:
self._print_log( logger.warning(
f"Download timeout! Tries remaining: {n_tries}. Retrying..." f"Download timeout! Tries remaining: {n_tries}. Retrying..."
) )
return self.execute(cmd, n_tries - 1) return self.execute(cmd, n_tries - 1)
@ -262,7 +259,7 @@ class SteamCMD:
# an assert checking that the download actually finished. # an assert checking that the download actually finished.
# If this happens, retry. # If this happens, retry.
if e.returncode == 134: if e.returncode == 134:
self._print_log( logger.error(
f"SteamCMD errored! Tries remaining: {n_tries}. Retrying..." f"SteamCMD errored! Tries remaining: {n_tries}. Retrying..."
) )
return self.execute(cmd, n_tries - 1) return self.execute(cmd, n_tries - 1)