24.05 Update

- Updated & cleaned up code comments
- Removed parenthesis from platform names
- Removed `window.columnconfigure` as it's implied and not needed
- Added shell variable to determine which scripts to install during updates
- Added Fire OS version, Fire Tools version, and platform output to terminal
- Made update tool more resilient to internet issues
- Update tool now uses `with` context manager to ensure files are fully downloaded and written before closing
- Cached "ft-identifying-fire-tablets.html" is now deleted during updates
- "requirements.txt" will now get updated
- Remade update tool and it now tells you which files are being updated and can now add or remove files in future updates
- Simplified folder deletion during failed package extraction
- Sped up package list generation by pre-formatting list on device
- Made package list bigger and scaled the scrollable frame better
- Temporary "packagelist" files are now deleted when application closes
- Cleaned up code by using some suggestions from Pylint
- Made custom disable/enable/extract terminal output cleaner by adding a blank line at the end
- Disable DNS will now remove "private_dns_specifier" key from device

Changelog.md

@@ -1,4 +1,19 @@
-## Updated main.py, version 04/23/2024
-- Fixed missing quotation marks breaking Custom DNS on Windows
-- Fixed update tool breaking when there's more than one decimal point in version number
-- Version bump (24.04.1)
+## Updated main.py, identify, version 05/01/2024
+- Version bump (24.05)
+- Updated & cleaned up code comments
+- Removed parenthesis from platform names
+- Removed `window.columnconfigure` as it's implied and not needed
+- Added shell variable to determine which scripts to install during updates
+- Added Fire OS version, Fire Tools version, and platform output to terminal
+- Made update tool more resilient to internet issues
+- Update tool now uses `with` context manager to ensure files are fully downloaded and written before closing
+- Cached "ft-identifying-fire-tablets.html" is now deleted during updates
+- "requirements.txt" will now get updated
+- Remade update tool and it now tells you which files are being updated and can now add or remove files in future updates
+- Simplified folder deletion during failed package extraction
+- Sped up package list generation by pre-formatting list on device
+- Made package list bigger and scaled the scrollable frame better
+- Temporary "packagelist" files are now deleted when application closes
+- Cleaned up code by using some suggestions from Pylint
+- Made custom disable/enable/extract terminal output cleaner by adding a blank line at the end
+- Disable DNS will now remove "private_dns_specifier" key from device

Fire-Tools/Scripts/Posix/identify.sh

@@ -1,10 +1,14 @@
 #!/usr/bin/env sh
 
-# Find Device Name by Regexing Model Number & Subtracting 2 Lines on Amazon Developer Docs (Cache Until Next Update)
-device="Unknown/Unsupported"
+# Set Placeholder Values for Device Name & Fire OS Version
+device="Unknown/Undetected"
+fireos="Unknown"
+
+# Find Device Name by Regexing Model Number & Subtracting 2 Lines on Amazon Developer Docs, Then get Fire OS Version
 if (adb shell echo "Device Found" >/dev/null 2>&1); then
     model=$(adb shell getprop ro.product.model)
     [ -e ft-identifying-tablet-devices.html ] || curl -O "https://developer.amazon.com/docs/fire-tablets/ft-identifying-tablet-devices.html"
     device=$(grep -B 2 "$model" < ft-identifying-tablet-devices.html | grep -E -o "(Kindle|Fire) (.*?)[G|g]en\)")
+    fireos=$(adb shell getprop ro.build.mktg.fireos)
 fi
-printf "%s" "Device: $device"
+printf "%s\n" "$device" "$fireos"

Fire-Tools/Scripts/PowerShell/identify.ps1

@@ -1,5 +1,8 @@
-# Find Device Name by Regexing Model Number & Subtracting 3 Lines on Amazon Developer Docs
+# Set Placeholder Values for Device Name & Fire OS Version
 $device = "Unknown/Undetected"
+$fireos = "Unknown"
+
+# Find Device Name by Regexing Model Number & Subtracting 3 Lines on Amazon Developer Docs, Then get Fire OS Version
 if (adb shell echo "Device Found" 2> $null){
     $model = (adb shell getprop ro.product.model)
     if (!(Test-Path .\ft-identifying-tablet-devices.html)){
@@ -8,6 +11,7 @@ if (adb shell echo "Device Found" 2> $null){
     $modelLine = (Select-String -Pattern "$model" -Path .\ft-identifying-tablet-devices.html).LineNumber
     if ($modelLine){
         $device = (Get-Content .\ft-identifying-tablet-devices.html | Select -Index ("$modelLine" - 3) | Select-String "(Kindle|Fire) (.*?)[Gg]en\)").Matches.Value
+        $fireos = (adb shell getprop ro.build.mktg.fireos)
     }
 }
-Write-Host "Device: $device"
+Write-Host "$device`n$fireos"

Fire-Tools/main.py

@@ -1,66 +1,72 @@
+import glob
+import os
+import requests
 import customtkinter as ctk
-import glob, os, requests
 
-# Build/Device Variables
-version = "24.04.1"
-platform = "(Linux/macOS)"
+# Platform & Device Variables
+version = "24.05"
+platform = "Linux/macOS"
 path = f"{os.getcwd()}/Scripts/Posix/"
 extension = ".sh"
+shell = "Posix"
 if os.name == "nt":
-    platform = "(Windows)"
+    platform = "Windows"
     path = f"powershell -ExecutionPolicy Bypass -file {os.getcwd()}\\Scripts\\PowerShell\\"
     extension = ".ps1"
+    shell = "PowerShell"
 
-# Identify Fire Device
-device = os.popen(f"{path}identify{extension}").read()
-print(f"{device}\n")
+# Get Device Name & Fire OS Version from identify Script, then Print Fire Tools Version, Platform, Device Name, and Software Version
+device = os.popen(f"{path}identify{extension}").read().splitlines()
+print(f"Fire Tools Version: {version}\nPlatform: {platform}\nDevice: {device[0]}\nSoftware: {device[1]}\n")
 
 # Window Config
 window = ctk.CTk()
-window.title(f"Fire Tools v{version} - {platform} | {device}")
+window.title(f"Fire Tools v{version} - ({platform}) | {device[0]}")
 window.geometry("980x550")
-window.columnconfigure(0)
-window.columnconfigure(1)
-window.columnconfigure(2)
 
-# If Update is Available, Download main.py then Modules for your OS
+# On Update, Delete 'ft-identifying-tablet-devices.html', Update Modules, and Make Scripts Executable (Linux/macOS)
 def update_tool():
-    print("\nChecking for Updates...\n")
-    latest = requests.get("https://github.com/mrhaydendp/Fire-Tools/raw/main/Fire-Tools/version").text
+    print("Checking for Updates...\n")
+    try:
+        latest = requests.get("https://github.com/mrhaydendp/Fire-Tools/raw/main/Fire-Tools/version", timeout=10).text
+    except requests.exceptions.ConnectionError:
+        latest = version
     if version.replace(".","") < latest.replace(".",""):
-        print("Latest Changelog:\n", requests.get("https://github.com/mrhaydendp/Fire-Tools/raw/main/Changelog.md").text)
-        open("main.py", "wb").write(requests.get("https://github.com/mrhaydendp/Fire-Tools/raw/main/Fire-Tools/main.py").content)
-        open("Debloat.txt", "wb").write(requests.get("https://github.com/mrhaydendp/Fire-Tools/raw/main/Fire-Tools/Debloat.txt").content)
-        modules = ["Posix/appinstaller.sh", "Posix/debloat.sh", "Posix/identify.sh"]
-        if os.name == "nt":    
-            modules = ["PowerShell/appinstaller.ps1", "PowerShell/debloat.ps1", "PowerShell/identify.ps1"]
+        if os.path.isfile("ft-identifying-tablet-devices.html"):
+            os.remove("ft-identifying-tablet-devices.html")
+        print("Latest Changelog:\n", requests.get("https://github.com/mrhaydendp/Fire-Tools/raw/main/Changelog.md", timeout=10).text)
+        modules = ["main.py", "Debloat.txt", "requirements.txt", f"Scripts/{shell}/appinstaller{extension}", f"Scripts/{shell}/debloat{extension}", f"Scripts/{shell}/identify{extension}"]
         for module in modules:
-            print(f"Updating: Fire-Tools/{module}")
-            open(f"Scripts/{module}", "wb").write(requests.get(f"https://github.com/mrhaydendp/Fire-Tools/raw/main/Fire-Tools/Scripts/{module}").content)
+            print(f"Updating: {module}")
+            with open(f"{module}", "wb") as file:
+                file.write(requests.get(f"https://github.com/mrhaydendp/Fire-Tools/raw/main/Fire-Tools/{module}", timeout=10).content)
+        if platform == "Linux/macOS":
+            os.popen("chmod +x Scripts/Posix/*.sh")
         print("\nUpdates Complete, Please Re-launch Application")
         quit()
     else:
         print("No Update Needed\n")
 
-# Run Debloat Script & Pass in Arguments
+# Run Debloat with Disable/Enable Option & Package Name
 def debloat(option,package):
     os.system(f"{path}debloat{extension} {option} {package}")
 
 # Open Debloat.txt in Preferred Text Editor
 def editfile():
-    if platform != "(Windows)":
+    if platform != "Windows":
         os.system("xdg-open Debloat.txt >/dev/null 2>&1 || open -e Debloat.txt")
     else:
         os.startfile('Debloat.txt')
 
-# Set DNS Mode to Hostname and Set Selected Provider as Private DNS
+# Set DNS Mode to Hostname, then Set Selected Provider as Private DNS
 def set_dns():
     dnsprovider = customdns.get()
     if dnsprovider == "None":
-        os.system(f"adb shell \"settings put global private_dns_mode off && printf 'Disabled Private DNS\\n\\n'\"")
+        os.system("adb shell \"settings put global private_dns_mode off && printf 'Disabled Private DNS\\n\\n'\"")
+        os.system("adb shell settings delete global private_dns_specifier")
     elif dnsprovider != "Select or Enter DNS Server":
-            os.system("adb shell settings put global private_dns_mode hostname")
-            os.system(f"adb shell \"settings put global private_dns_specifier {dnsprovider} && printf 'Successfully Set Private DNS to: {dnsprovider}\\n\\n'\"")
+        os.system("adb shell settings put global private_dns_mode hostname")
+        os.system(f"adb shell \"settings put global private_dns_specifier {dnsprovider} && printf 'Successfully Set Private DNS to: {dnsprovider}\\n\\n'\"")
 
 # Get all .apk(m) Files from Selected Folder & Pass to AppInstaller Script
 def appinstaller(folder):
@@ -70,8 +76,8 @@ def appinstaller(folder):
 
 # Attempt to Disable OTA Packages
 def disableota():
-    ota = "com.amazon.device.software.ota", "com.amazon.device.software.ota.override", "com.amazon.kindle.otter.oobe.forced.ota"
-    for package in ota:
+    ota_packages = "com.amazon.device.software.ota", "com.amazon.device.software.ota.override", "com.amazon.kindle.otter.oobe.forced.ota"
+    for package in ota_packages:
         debloat("Disable",package)
 
 # Pass Selected Package to Appinstaller with Launcher Argument
@@ -85,23 +91,19 @@ def set_launcher():
         for launcher in glob.iglob(search):
             os.system(f"{path}appinstaller{extension} \"{launcher}\" Launcher")
 
-# Make Folder using Package Name & Extract Package from Device
+# Extract Selected Package to Extracted/{package} If not Already Present
 def extract(package):
     if not os.path.exists(f"Extracted/{package}"):
         print("Extracting:", package)
         os.mkdir(f"Extracted/{package}")
-        for packagelocation in os.popen(f"adb shell pm path {package}").read().splitlines():
-                packagelocation = packagelocation.replace("package:","")
-                os.system(f"adb pull {packagelocation} ./Extracted/{package}")
-                if os.listdir(f"Extracted/{package}"):
-                    print("Success\n")
-                else:
-                    os.rmdir(f"Extracted/{package}")
-                    print("Fail\n")
+        for packagelocation in os.popen(f"adb shell \"pm path {package} | cut -f2 -d:\"").read().splitlines():
+            os.system(f"adb pull {packagelocation} ./Extracted/{package}")
+            if not os.listdir(f"Extracted/{package}"):
+                os.rmdir(f"Extracted/{package}")
     else:
-        print(f"Found at: /Extracted/{package}\n")
+        print(f"Found at: /Extracted/{package}")
 
-# Add Selected Packages to 'customlist' & if Package is Already Found in List, Remove it
+# Add Selected Packages to 'customlist' & Remove if Package is Already Found
 def add_package(package):
     if package in customlist:
         customlist.remove(package)
@@ -115,8 +117,9 @@ def custom(option):
             extract(package)
         else:
             debloat(option,package)
+    print("")
 
-# Switch Segmented Button's Text & Command to Selected Option
+# Switch Segmented Button's Text & Command to the Selected Option
 def switch(option):
     selected.configure(text=f"{option} Selected",command=lambda: custom(option))
 
@@ -181,22 +184,27 @@ def switch(option):
 selected = ctk.CTkButton(window, text="Disable Selected", width=200, height=50, command=lambda: custom("Disable"))
 selected.grid(row=6, column=2, padx=60, pady=15)
 
-tabview = ctk.CTkTabview(window, width=20)
+tabview = ctk.CTkTabview(window, width=250, height=300)
 tabview.add("Enabled")
 tabview.add("Disabled")
-tabview.place(x=698, y=55)
-if os.name == "nt":
-    tabview.place(x=680, y=55)
+tabview.place(x=694, y=55)
+if platform == "Windows":
+    tabview.place(x=674, y=55)
 
 enabled_list = ctk.CTkScrollableFrame(tabview.tab("Enabled"), width=200, height=230)
 enabled_list.pack()
 disabled_list = ctk.CTkScrollableFrame(tabview.tab("Disabled"), width=200, height=230)
 disabled_list.pack()
 customlist = []
 
-for package in os.popen("adb shell pm list packages -e").read().splitlines():
-    checkbox = ctk.CTkCheckBox(enabled_list, text=package.replace("package:",""), command = lambda param = package.replace("package:",""): add_package(param)).pack()
-for package in os.popen("adb shell pm list packages -d").read().splitlines():
-   checkbox = ctk.CTkCheckBox(disabled_list, text=package.replace("package:",""), command = lambda param = package.replace("package:",""): add_package(param)).pack()
+if device[0] != "Unknown/Undetected":
+    for enabled_package in os.popen("adb shell \"pm list packages -e | cut -f2 -d:\"").read().splitlines():
+        checkbox = ctk.CTkCheckBox(enabled_list, text=enabled_package, command = lambda param = enabled_package: add_package(param)).pack()
+    for disabled_package in os.popen("adb shell \"pm list packages -d | cut -f2 -d:\"").read().splitlines():
+        checkbox = ctk.CTkCheckBox(disabled_list, text=disabled_package, command = lambda param = disabled_package: add_package(param)).pack()
 
 window.mainloop()
+
+# Remove Temp Files when Application Closes
+for temp_file in glob.glob("*packagelist*"):
+    os.remove(temp_file)

Fire-Tools/version

@@ -1 +1 @@
-24.04.1
+24.05

README.md

@@ -1,8 +1,6 @@
 ## Fire Tools
 Fire Tools is a powerful collection of tools that helps debloat and install Google services on your Fire Tablet to make it feel snappier and improve usability. Additionally, it supports custom launchers such as Nova, Lawnchair, or any `.apk(m)`. If you need to install multiple apps quickly, there's a batch installer. It's as easy as dropping all your `.apk(m)`s in the Batch folder and clicking the Batch Install button! No root required!
 
-**Due to an issue with the updater in 24.04, 24.04.1 cannot be downloaded using the update tool. You can wait until 24.05 is released or manually update by downloading and replacing 'main.py' from [here](https://github.com/mrhaydendp/Fire-Tools/blob/main/Fire-Tools/main.py)**
-
 ![Fire Tools Screenshot](Screenshot.png)
 
 **Features:**