warlock-manager 2.2.6__tar.gz → 2.2.7__tar.gz

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warlock-manager
-Version: 2.2.6
+Version: 2.2.7
 Summary: Dependency library for game-server management applications.
 Author-email: Charlie Powell <cdp1337@bitsnbytes.dev>
 Maintainer-email: Charlie Powell <cdp1337@bitsnbytes.dev>

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "warlock-manager"
-version = "2.2.6"
+version = "2.2.7"
 description = "Dependency library for game-server management applications."
 readme = "README.md"
 requires-python = ">=3.10"

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/warlock_manager/libs/cmd.py

@@ -329,6 +329,7 @@ class PipeCmd(Cmd):
 				logging.debug('Running piped command: %s' % ' '.join(self.cmd))
 				self.result = subprocess.Popen(
 					self.cmd,
+					cwd=self._cwd,
 					stdout=subprocess.PIPE,
 					stderr=subprocess.PIPE
 				)
@@ -360,6 +361,7 @@ class BackgroundCmd(Cmd):
 				logging.debug('Running background command: %s' % ' '.join(self.cmd))
 				self.result = subprocess.Popen(
 					self.cmd,
+					cwd=self._cwd,
 					stdout=subprocess.DEVNULL,
 					stderr=subprocess.DEVNULL
 				)

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/warlock_manager/libs/download.py

@@ -3,6 +3,10 @@ import requests
 import json
 from warlock_manager.libs import utils
 from warlock_manager.libs import cache
+from warlock_manager.libs.meta import get_meta
+
+# "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+USER_AGENT = 'Warlock Manager/%s (warlock.nexus) <staff@bitsnbytes.dev>' % get_meta()['version']
 
 
 def download_file(url: str, destination: str):
@@ -18,7 +22,7 @@ def download_file(url: str, destination: str):
     # Ensure the target directory exists
     utils.ensure_file_parent_exists(destination)
 
-    response = requests.get(url, stream=True)
+    response = requests.get(url, stream=True, headers={'User-Agent': USER_AGENT})
     response.raise_for_status()  # Check if the request was successful
 
     with open(destination, 'wb') as f:
@@ -47,7 +51,7 @@ def download_json(url: str) -> dict:
     if cached is not None:
         return json.loads(cached)
 
-    response = requests.get(url)
+    response = requests.get(url, headers={'User-Agent': USER_AGENT, 'Accept': 'application/json'})
     response.raise_for_status()  # Check if the request was successful
     data = response.json()
 

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/warlock_manager/libs/utils.py

@@ -121,7 +121,7 @@ def makedirs(target_dir: str):
 		return
 
 	# Ensure the directory exists within the context of either this game or the game owner's home directory
-	if not (target_dir.startswith(get_app_directory()) or target_dir.startswith(get_home_directory())):
+	if not (target_dir.startswith(get_base_directory()) or target_dir.startswith(get_home_directory())):
 		raise Exception('Cannot create directory outside of game directory: %s' % target_dir)
 
 	# Iterate up until the parent directory exists.

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/warlock_manager/nexus/nexus.py

@@ -8,7 +8,7 @@ import hashlib
 import secrets
 from warlock_manager.libs.cmd import Cmd
 from warlock_manager.services.base_service import BaseService
-from warlock_manager.libs.utils import get_app_directory
+from warlock_manager.libs.utils import get_base_directory
 
 
 class Nexus:
@@ -34,7 +34,7 @@ class Nexus:
 			with open(self.email_file, 'r') as f:
 				self.email = f.read().strip()
 
-		manager_meta_path = os.path.join(get_app_directory(), '.manage.json')
+		manager_meta_path = os.path.join(get_base_directory(), '.manage.json')
 		if os.path.exists(manager_meta_path):
 			with open(manager_meta_path, 'r') as f:
 				meta = json.load(f)
@@ -222,7 +222,7 @@ class Nexus:
 			# Only push stats for running services
 			return
 
-		last_checkin_file = os.path.join(get_app_directory(), '.cache', '.%s.checkin' % service.service)
+		last_checkin_file = os.path.join(get_base_directory(), '.cache', '.%s.checkin' % service.service)
 		now = int(time.time())
 		if os.path.exists(last_checkin_file):
 			# Only push stats once every 15 minutes

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/warlock_manager/services/base_service.py

@@ -1321,7 +1321,7 @@ class BaseService(ABC):
 			logging.info('Removed environment file for %s at %s' % (self.service, self._env_file))
 
 		target_dir = self.get_app_directory()
-		app_dir = os.path.join(self.game.get_app_directory(), 'AppFiles')
+		app_dir = os.path.join(utils.get_base_directory(), 'AppFiles')
 		if target_dir != app_dir and os.path.exists(target_dir):
 			# Only remove app directory if it's different than the game app.
 			# This is important because by default game instances share the same application base.
@@ -1379,7 +1379,7 @@ class BaseService(ABC):
 
 		:return:
 		"""
-		base = self.game.get_app_directory()
+		base = utils.get_base_directory()
 		temp_store = os.path.join(base, '.save-%s' % self.service)
 		save_source = self.get_save_directory()
 		save_files = self.get_save_files()
@@ -1433,7 +1433,7 @@ class BaseService(ABC):
 
 		:return:
 		"""
-		base = self.game.get_app_directory()
+		base = utils.get_base_directory()
 		temp_store = os.path.join(base, '.save-%s' % self.service)
 		target_dir = self.get_backup_directory()
 		base_name = self.service
@@ -1517,7 +1517,7 @@ class BaseService(ABC):
 			print('Game server is currently running, please stop it before restoring a backup!', file=sys.stderr)
 			return False
 
-		base = self.game.get_app_directory()
+		base = utils.get_base_directory()
 		temp_store = os.path.join(base, '.restore-%s' % self.service)
 		save_dest = self.get_save_directory()
 
@@ -1567,7 +1567,7 @@ class BaseService(ABC):
 
 		:return:
 		"""
-		base = self.game.get_app_directory()
+		base = utils.get_base_directory()
 		temp_store = os.path.join(base, '.restore-%s' % self.service)
 
 		# Cleanup

{warlock_manager-2.2.6 → warlock_manager-2.2.7}/warlock_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warlock-manager
-Version: 2.2.6
+Version: 2.2.7
 Summary: Dependency library for game-server management applications.
 Author-email: Charlie Powell <cdp1337@bitsnbytes.dev>
 Maintainer-email: Charlie Powell <cdp1337@bitsnbytes.dev>