From 7ae3f373f5a338afa8ea9ee5f7d63c82025db917 Mon Sep 17 00:00:00 2001
From: nothing <nothing>
Date: Sun, 21 Jan 2024 22:38:12 +0100
Subject: [PATCH] renaming and other fixes

---
 .gitignore                                     |  4 ++--
 ...hron_updater.py => Keychron_mice_updater.py | 11 ++---------
 build.bat                                      |  2 +-
 innosetup/setup.iss                            | 18 +++++++++---------
 readme.md                                      |  2 +-
 5 files changed, 15 insertions(+), 22 deletions(-)
 rename Keychron_updater.py => Keychron_mice_updater.py (86%)

diff --git a/.gitignore b/.gitignore
index 5224b1f..b6be538 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 build/
 dist/
 app.log
-Keychron_updater.spec
-innosetup/Keychron_updater_setup.exe
\ No newline at end of file
+Keychron_mice_updater.spec
+innosetup/Keychron_mice_updater_setup.exe
\ No newline at end of file
diff --git a/Keychron_updater.py b/Keychron_mice_updater.py
similarity index 86%
rename from Keychron_updater.py
rename to Keychron_mice_updater.py
index 10f14ad..91529a0 100644
--- a/Keychron_updater.py
+++ b/Keychron_mice_updater.py
@@ -1,8 +1,6 @@
-import requests, gdown, zipfile, os, ctypes, tempfile, shutil, subprocess, logging
+import requests, gdown, zipfile, os, ctypes, tempfile, shutil, subprocess
 from tkinter import messagebox
 
-logging.basicConfig(filename='app.log', filemode='w', format='%(name)s - %(levelname)s - %(message)s')
-
 install_path = "C:\\Program Files (x86)\\Keychron"
 
 def get_installed_version():
@@ -11,7 +9,6 @@ def get_installed_version():
             installed_version = f.read().split('<software caption="Keychron" version="')[1].split('"')[0]
         return installed_version
     except Exception as e:
-        logging.error(f"Failed to get installed version: {e}")
         messagebox.showerror("Error", f"Failed to get installed version: {e}")
 
 def get_online_version_and_url():
@@ -28,16 +25,14 @@ def get_online_version_and_url():
 
         return online_version, download_url
     except Exception as e:
-        logging.error(f"Failed to get online version and url: {e}")
         messagebox.showerror("Error", f"Failed to get online version and url: {e}")
 
 def download_and_extract_file(download_url, tmp_path):
     try:
-        gdown.download(download_url, tmp_path + '\\Keychron.zip', quiet=False)
+        gdown.download(download_url, tmp_path + '\\Keychron.zip', quiet=True)
         with zipfile.ZipFile(tmp_path + '\\Keychron.zip', 'r') as zip_ref:
             zip_ref.extractall(tmp_path)
     except Exception as e:
-        logging.error(f"Failed to download and extract file: {e}")
         messagebox.showerror("Error", f"Failed to download and extract file: {e}")
 
 def run_exe(tmp_path):
@@ -48,7 +43,6 @@ def run_exe(tmp_path):
                     process = subprocess.Popen([os.path.join(root, file)], shell=True)
                     process.wait()
     except Exception as e:
-        logging.error(f"Failed to run exe: {e}")
         messagebox.showerror("Error", f"Failed to run exe: {e}")
 
 def main():
@@ -65,7 +59,6 @@ def main():
                 run_exe(tmp_path)
                 shutil.rmtree(tmp_path)
     except Exception as e:
-        logging.error(f"An error occurred: {e}")
         messagebox.showerror("Error", f"An error occurred: {e}")
 
 if __name__ == "__main__":
diff --git a/build.bat b/build.bat
index de26476..c2038b5 100644
--- a/build.bat
+++ b/build.bat
@@ -1 +1 @@
-pyinstaller --onefile --noconsole Keychron_updater.py
\ No newline at end of file
+pyinstaller --onefile --noconsole Keychron_mice_updater.py
\ No newline at end of file
diff --git a/innosetup/setup.iss b/innosetup/setup.iss
index 5c7289e..4e3b8d9 100644
--- a/innosetup/setup.iss
+++ b/innosetup/setup.iss
@@ -1,24 +1,24 @@
 [Setup]
-AppName=Keychron Software Update
+AppName=Keychron Mice Software Updater
 AppVersion=1.0
-DefaultDirName={commonpf}\Keychron Software Update
-DefaultGroupName=Keychron Software Update
+DefaultDirName={commonpf}\Keychron Mice Software Updater
+DefaultGroupName=Keychron Mice Software Updater
 UninstallDisplayIcon={app}\keychron.exe
 OutputDir=.
-OutputBaseFilename=Keychron_updater_setup   
+OutputBaseFilename=Keychron_mice_updater_setup   
 Compression=lzma
 SolidCompression=yes
 
 [Files]
-Source: "..\dist\Keychron_updater.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\dist\Keychron_mice_updater.exe"; DestDir: "{app}"; Flags: ignoreversion
 
 [Icons]
-Name: "{group}\Keychron Software Updater"; Filename: "{app}\Keychron_updater.exe"
-Name: "{group}\Uninstall Keychron Software Updater"; Filename: "{uninstallexe}"
-Name: "{commonstartup}\Keychron Software Updater"; Filename: "{app}\Keychron_updater.exe"; Tasks: autostart
+Name: "{group}\Keychron Mice Software Updater"; Filename: "{app}\Keychron_mice_updater.exe"
+Name: "{group}\Uninstall Keychron Mice Software Updater"; Filename: "{uninstallexe}"
+Name: "{commonstartup}\Keychron Mice Software Updater"; Filename: "{app}\Keychron_mice_updater.exe"; Tasks: autostart
 
 [Run]
-Filename: "{app}\Keychron_updater.exe"; Description: "Launch the application"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\Keychron_mice_updater.exe"; Description: "Launch the application"; Flags: nowait postinstall skipifsilent
 
 [Tasks]
 Name: "autostart"; Description: "Start the application when Windows starts"; GroupDescription: "Additional tasks"; Flags: checkedonce
\ No newline at end of file
diff --git a/readme.md b/readme.md
index e62a5ae..cbcc987 100644
--- a/readme.md
+++ b/readme.md
@@ -16,7 +16,7 @@ This Python script automatically checks for a new version of the Keychron mice s
 
 ## Installation
 
-1. Navigate to the [Releases](https://github.com/Pyenb/Keychron_software_updater/releases) section of this repository.
+1. Navigate to the [Releases](https://github.com/Pyenb/Keychron_mice_software_updater/releases) section of this repository.
 2. Download the latest release of the Keychron Software Updater.
 3. Extract the downloaded `.zip` file.
 4. Run the downloaded `.exe` file to start the installation process. Follow the prompts to complete the installation.