diff --git a/app/__init__.py b/app/__init__.py index 033b428..7430605 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,8 @@ from typing import List from app.utils_drive import Drive -from app.globals import * from tkinter import * from tkinter import ttk +import platform class App: @@ -13,6 +13,8 @@ class App: drive_tree = None def __init__(self): + self.OS_TYPE = platform.system() + self.root = Tk() self.root.title("Disk Eraser") self.root.geometry("400x300") @@ -40,14 +42,14 @@ class App: def __load_drives(self): - if OS_TYPE == "Windows": + if self.OS_TYPE == "Windows": import wmi c = wmi.WMI() self.drives = [] if disks := c.Win32_DiskDrive(): for disk in disks: self.drives.append(Drive(disk.Model, disk.Name, disk.InterfaceType, disk.DefaultBlockSize, int(disk.Size), disk.SerialNumber)) - elif OS_TYPE == "Linux": + elif self.OS_TYPE == "Linux": from diskinfo import Disk, DiskInfo di = DiskInfo() disks = di.get_disk_list(sorting=True) diff --git a/app/globals.py b/app/globals.py deleted file mode 100644 index b98c469..0000000 --- a/app/globals.py +++ /dev/null @@ -1,3 +0,0 @@ -import platform - -OS_TYPE = platform.system() \ No newline at end of file diff --git a/app/utils_drive.py b/app/utils_drive.py index e5219ec..2546076 100644 --- a/app/utils_drive.py +++ b/app/utils_drive.py @@ -1,5 +1,3 @@ -from app.globals import OS_TYPE - class Drive(): path: str