Skip to content

Swapping os.path with Path in check version. #1

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

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Swapping os.path with Path in check version. #1

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
20 changes: 8 additions & 12 deletions htpclient/binarydownload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ def get_version(self):
def check_client_version(self):
if self.args.disable_update:
return
if os.path.isfile("old.zip"):
os.unlink("old.zip") # cleanup old version
Path("old.zip").unlink(missing_ok=True) # cleanup old version
query = copy_and_set_token(dict_checkVersion, self.config.get_value('token'))
query['version'] = Initialize.get_version_number()
req = JsonRequest(query)
Expand All @@ -47,17 +46,14 @@ def check_client_version(self):
logging.warning("Got empty URL for client update!")
else:
logging.info("New client version available!")
if os.path.isfile("update.zip"):
os.unlink("update.zip")
Path("update.zip").unlink(missing_ok=True)
Download.download(url, "update.zip")
if os.path.isfile("update.zip") and os.path.getsize("update.zip"):
if os.path.isfile("old.zip"):
os.unlink("old.zip")
os.rename("hashtopolis.zip", "old.zip")
os.rename("update.zip", "hashtopolis.zip")
Path("old.zip").unlink(missing_ok=True)
Path("hashtopolis.zip").unlink(missing_ok=True)
Path("update.zip").rename("hashtopolis.zip")
logging.info("Update received, restarting client...")
if os.path.exists("lock.pid"):
os.unlink("lock.pid")
Path("lock.pid").unlink(missing_ok=True)
os.execl(sys.executable, sys.executable, "hashtopolis.zip")
exit(0)

Expand Down Expand Up @@ -133,7 +129,7 @@ def check_prince(self):
os.rmdir("temp")
logging.debug("PRINCE downloaded and extracted")
return True

def check_preprocessor(self, task):
logging.debug("Checking if requested preprocessor is present...")
path = Path(self.config.get_value('preprocessors-path'), str(task.get_task()['preprocessor']))
Expand Down Expand Up @@ -208,7 +204,7 @@ def check_version(self, cracker_id):
# Linux
cmd = f"./7zr{Initialize.get_os_extension()} x -o'{temp_folder}' '{zip_file}'"
os.system(cmd)

# Clean up 7zip
os.unlink(zip_file)

Expand Down