Refactor TokenOptimizer into modular structure

- Deleted main.py and pyproject.toml as part of restructuring.
- Created run.py as the new entry point for the application.
- Introduced src/__init__.py to define the package structure.
- Moved AITokenCrusher class to src/app.py and refactored for modularity.
- Added src/config.py for configuration data including options and themes.
- Implemented src/optimizations.py for optimization logic.
- Created src/ui.py to handle UI creation and management.
- Added pytest.ini for test configuration.
- Created conftest.py and multiple test files for unit testing.

Author: totalbrain

main.py

@@ -0,0 +1,4 @@
+[pytest]
+pythonpath = src
+testpaths = tests
+addopts = -ra -q

pyproject.toml

@@ -0,0 +1,21 @@
+# run.py - Entry point for AI Token Crusher
+import sys
+import os
+
+# Add src to path so imports work when running from root
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
+
+# Optional: Better error if tkdnd2 not installed
+try:
+    from tkinterdnd2 import TkinterDnD
+    RootClass = TkinterDnD.Tk
+except ImportError:
+    from tkinter import Tk
+    RootClass = Tk
+
+from src.app import AITokenCrusher
+
+if __name__ == "__main__":
+    root = RootClass()
+    app = AITokenCrusher(root)
+    root.mainloop()

pytest.ini

@@ -1,94 +1,122 @@
-# main.py - AI Token Crusher v1.0
+# src/app.py - Main application class (fully modular, no early Tk errors)
 import tkinter as tk
-from tkinter import ttk, filedialog, messagebox, scrolledtext
+from tkinter import ttk, filedialog, messagebox
 import webbrowser
-import re
+import os
+
+# Drag-and-drop support (optional)
+try:
+    from tkinterdnd2 import DND_FILES, TkinterDnD
+    TKDND_AVAILABLE = True
+except ImportError:
+    DND_FILES = None
+    TkinterDnD = tk.Tk
+    TKDND_AVAILABLE = False
+
+from .config import OPTIONS_DEFAULT, THEMES, LINKS
+from .ui import create_ui
+from .optimizations import apply_optimizations
+
 
 class AITokenCrusher:
     def __init__(self, root):
         self.root = root
         self.root.title("AI Token Crusher - Cut up to 75% tokens")
         self.root.geometry("1280x820")
         self.root.minsize(1000, 700)
-        self.root.configure(bg="#0d1117")
 
+        # --- CRITICAL FIX: Create BooleanVars AFTER root exists ---
+        self.options = {}
+        for key, default in OPTIONS_DEFAULT.items():
+            self.options[key] = tk.BooleanVar(value=default)
+
+        self.is_dark_theme = True
+        self.ui_elements = {}
+        self.checkbuttons = []
+        self.link_labels = []
+
+        # Initial theme setup
+        self.root.configure(bg=THEMES["dark"]["bg"])
         style = ttk.Style()
         style.theme_use("clam")
-        style.configure("Title.TLabel", foreground="#58a6ff", font=("Segoe UI", 18, "bold"), background="#0d1117")
-        style.configure("TButton", padding=10, font=("Segoe UI", 9, "bold"))
-
-        self.options = {
-            "remove_comments": tk.BooleanVar(value=True),
-            "remove_docstrings": tk.BooleanVar(value=True),
-            "remove_blank_lines": tk.BooleanVar(value=True),
-            "remove_extra_spaces": tk.BooleanVar(value=True),
-            "single_line_mode": tk.BooleanVar(value=True),
-            "shorten_keywords": tk.BooleanVar(value=True),
-            "replace_booleans": tk.BooleanVar(value=True),
-            "use_short_operators": tk.BooleanVar(value=True),
-            "remove_type_hints": tk.BooleanVar(value=True),
-            "minify_structures": tk.BooleanVar(value=True),
-            "unicode_shortcuts": tk.BooleanVar(value=True),
-            "shorten_print": tk.BooleanVar(value=True),
-            "remove_asserts": tk.BooleanVar(value=True),
-            "remove_pass": tk.BooleanVar(value=True),
-        }
-
-        self.create_ui()
-
-    def create_ui(self):
-        main = tk.Frame(self.root, bg="#0d1117")
-        main.pack(fill="both", expand=True, padx=20, pady=20)
-
-        ttk.Label(main, text="AI Token Crusher", style="Title.TLabel").pack(pady=(0, 5))
-        ttk.Label(main, text="Cut up to 75% of tokens for Grok • GPT • Claude • Llama", 
-                 foreground="#8b949e", font=("Segoe UI", 11), background="#0d1117").pack(pady=(0, 20))
-
-        top = tk.Frame(main, bg="#0d1117")
-        top.pack(fill="both", expand=True)
-
-        input_frame = tk.LabelFrame(top, text=" Input Text / Code ", fg="#f0f6fc", bg="#161b22", font=("Segoe UI", 10, "bold"))
-        input_frame.pack(side="left", fill="both", expand=True, padx=(0, 10))
-        self.input_text = scrolledtext.ScrolledText(input_frame, font=("Consolas", 10), bg="#0d1117", fg="#c9d1d9")
-        self.input_text.pack(fill="both", expand=True, padx=10, pady=10)
-
-        btns = tk.Frame(input_frame, bg="#161b22")
-        btns.pack(pady=5)
-        ttk.Button(btns, text="Load File", command=self.load_file).pack(side="left", padx=5)
-        ttk.Button(btns, text="Copy Output", command=self.copy_output).pack(side="left", padx=5)
-
-        options_frame = tk.LabelFrame(top, text=" Optimization Techniques ", fg="#f0f6fc", bg="#161b22", font=("Segoe UI", 10, "bold"))
-        options_frame.pack(side="right", fill="y", padx=(10, 0))
-        canvas = tk.Canvas(options_frame, bg="#161b22", highlightthickness=0)
-        scrollbar = ttk.Scrollbar(options_frame, command=canvas.yview)
-        scroll_frame = tk.Frame(canvas, bg="#161b22")
-        canvas.create_window((0, 0), window=scroll_frame, anchor="nw")
-        canvas.configure(yscrollcommand=scrollbar.set)
-        canvas.pack(side="left", fill="both", expand=True, padx=10, pady=10)
-        scrollbar.pack(side="right", fill="y")
-
-        for key, var in self.options.items():
-            name = key.replace("_", " ").title().replace("Shorten", "Short").replace("Remove", "Strip")
-            tk.Checkbutton(scroll_frame, text=name, variable=var, bg="#161b22", fg="#c9d1d9", selectcolor="#21262d").pack(anchor="w", pady=2, padx=15)
-
-        ttk.Button(main, text="CRUSH TOKENS →", command=self.optimize).pack(pady=20)
-
-        output_frame = tk.LabelFrame(main, text=" Crushed Output (AI-Safe) ", fg="#f0f6fc", bg="#161b22", font=("Segoe UI", 10, "bold"))
-        output_frame.pack(fill="both", expand=True, pady=(10, 0))
-        self.output_text = scrolledtext.ScrolledText(output_frame, font=("Consolas", 10), bg="#0d1117", fg="#79c0ff")
-        self.output_text.pack(fill="both", expand=True, padx=10, pady=10)
-        ttk.Button(output_frame, text="Save Output", command=self.save_output).pack(pady=5)
-
-        self.stats = ttk.Label(main, text="Ready to crush tokens...", foreground="#79c0ff", font=("Consolas", 11, "bold"), background="#161b22")
-        self.stats.pack(pady=10)
-
-        footer = tk.Frame(main, bg="#0d1117")
-        footer.pack(pady=15)
-        links = [("GitHub", "https://github.com/totalbrain/TokenOptimizer"), ("Roadmap", "https://github.com/users/totalbrain/projects/1")]
-        for text, url in links:
-            link = tk.Label(footer, text=text, fg="#58a6ff", bg="#0d1117", cursor="hand2", font=("Segoe UI", 9, "underline"))
-            link.pack(side="left", padx=20)
-            link.bind("<Button-1>", lambda e, u=url: webbrowser.open(u))
+        style.configure(
+            "Title.TLabel",
+            foreground="#58a6ff",
+            font=("Segoe UI", 18, "bold"),
+            background=THEMES["dark"]["bg"]
+        )
+
+        # Build UI
+        create_ui(self)
+
+        # Enable drag & drop if available
+        self.enable_drag_and_drop()
+
+    def toggle_theme(self):
+        self.is_dark_theme = not self.is_dark_theme
+        self.apply_theme()
+
+    def apply_theme(self):
+        theme = THEMES["dark" if self.is_dark_theme else "light"]
+
+        # Update root
+        self.root.configure(bg=theme["bg"])
+
+        # Update ttk style
+        style = ttk.Style()
+        style.configure("Title.TLabel", foreground=theme["accent"], background=theme["bg"])
+
+        # Update theme button
+        self.theme_button.config(
+            text="☀️" if self.is_dark_theme else "🌙",
+            bg=theme["bg"],
+            fg=theme["accent"]
+        )
+
+        # Update stored UI elements
+        for elem, widget in self.ui_elements.items():
+            if hasattr(widget, "configure"):
+                if "bg" in widget.config():
+                    widget.configure(bg=theme.get("bg", theme["frame_bg"]))
+                if "fg" in widget.config():
+                    widget.configure(fg=theme.get("text_bright", theme["text"]))
+
+        # Special widgets
+        self.input_text.configure(bg=theme["input_bg"], fg=theme["input_fg"])
+        self.output_text.configure(fg=theme["output_fg"])
+        self.stats.configure(foreground=theme["accent_secondary"], background=theme["frame_bg"])
+
+        # Checkbuttons
+        for cb in self.checkbuttons:
+            cb.configure(bg=theme["frame_bg"], fg=theme["text"], selectcolor=theme["select_bg"])
+
+        # Links
+        for link in self.link_labels:
+            link.configure(bg=theme["bg"], fg=theme["accent"])
+
+    def enable_drag_and_drop(self):
+        if not TKDND_AVAILABLE or DND_FILES is None:
+            return
+        try:
+            self.input_text.drop_target_register(DND_FILES)
+            self.input_text.dnd_bind("<<Drop>>", self.on_drop_files)
+        except Exception:
+            pass  # Silently skip if DnD setup fails
+
+    def on_drop_files(self, event):
+        file_paths = self.root.splitlist(event.data)
+        allowed = {".py", ".txt", ".md", ".json"}
+        for path in file_paths:
+            if os.path.splitext(path)[1].lower() in allowed:
+                try:
+                    with open(path, "r", encoding="utf-8") as f:
+                        content = f.read()
+                    self.input_text.delete(1.0, tk.END)
+                    self.input_text.insert(tk.END, content)
+                    return
+                except Exception as e:
+                    messagebox.showerror("Read Error", f"Failed to open file:\n{e}")
+        messagebox.showwarning("Invalid File", "Only .py, .txt, .md, .json files are supported.")
 
     def load_file(self):
         path = filedialog.askopenfilename(filetypes=[("All Files", "*.*")])
@@ -114,51 +142,25 @@ def save_output(self):
     def optimize(self):
         text = self.input_text.get(1.0, tk.END).strip()
         if not text:
-            messagebox.showwarning("Empty", "Paste or load text first!")
+            messagebox.showwarning("Empty Input", "Please paste or load some text first.")
             return
 
-        optimized = self.apply_optimizations(text)
+        optimized = apply_optimizations(self.options, text)
+
         self.output_text.delete(1.0, tk.END)
         self.output_text.insert(tk.END, optimized)
 
         before = len(text)
         after = len(optimized)
         saved = 100 * (before - after) / before if before else 0
-        self.stats.config(text=f"Before: {before:,} → After: {after:,} chars | Saved: {saved:.1f}%")
-
-    def apply_optimizations(self, text):
-        import re
-        if self.options["remove_comments"].get():
-            text = re.sub(r'#.*', '', text)
-            text = re.sub(r'"""[\s\S]*?"""|\'\'\'[\s\S]*?\'\'\'', '', text)
-        if self.options["remove_docstrings"].get():
-            text = re.sub(r'^[\r\n\s]*("""|\'\'\').*?\1', '', text, count=1, flags=re.DOTALL)
-        if self.options["remove_blank_lines"].get():
-            text = "\n".join(line for line in text.splitlines() if line.strip())
-        if self.options["remove_extra_spaces"].get():
-            text = re.sub(r'[ \t]+', ' ', text)
-        if self.options["single_line_mode"].get():
-            text = text.replace("\n", "⏎")
-        if self.options["shorten_keywords"].get():
-            rep = {"def ": "d ", "return ": "r ", "import ": "i ", "from ": "f ", "as ": "a ", "if ": "if", "class ": "c ", "lambda ": "λ "}
-            for k, v in rep.items(): text = text.replace(k, v)
-        if self.options["replace_booleans"].get():
-            text = text.replace("True", "1").replace("False", "0").replace("None", "~")
-        if self.options["use_short_operators"].get():
-            text = text.replace("==", "≡").replace("!=", "≠").replace(" and ", "∧").replace(" or ", "∨")
-        if self.options["remove_type_hints"].get():
-            text = re.sub(r':\s*[^=\n\->]+', '', text)
-            text = re.sub(r'->\s*[^:\n]+', '', text)
-        if self.options["minify_structures"].get():
-            text = re.sub(r',\s+', ',', text)
-            text = re.sub(r':\s+', ':', text)
-        if self.options["unicode_shortcuts"].get():
-            text = text.replace(" in ", "∈").replace(" not in ", "∉")
-        if self.options["shorten_print"].get():
-            text = re.sub(r'print\s*\(', 'p(', text)
-        return text.strip() + "\n"
 
+        self.stats.config(
+            text=f"Before: {before:,} → After: {after:,} chars | Saved: {saved:.1f}%"
+        )
+
+
+# Entry point when running directly (python -m src.app)
 if __name__ == "__main__":
-    root = tk.Tk()
+    root = TkinterDnD.Tk() if TKDND_AVAILABLE else tk.Tk()
     app = AITokenCrusher(root)
     root.mainloop()

run.py

@@ -0,0 +1,56 @@
+# src/config.py - Only pure data, no Tkinter variables
+import tkinter as tk  # فقط برای type hint و استفاده در جاهای دیگه
+
+# Default option states (will be converted to BooleanVar in app.py)
+OPTIONS_DEFAULT = {
+    "remove_comments": True,
+    "remove_docstrings": True,
+    "remove_blank_lines": True,
+    "remove_extra_spaces": True,
+    "single_line_mode": True,
+    "shorten_keywords": True,
+    "replace_booleans": True,
+    "use_short_operators": True,
+    "remove_type_hints": True,
+    "minify_structures": True,
+    "unicode_shortcuts": True,
+    "shorten_print": True,
+    "remove_asserts": True,
+    "remove_pass": True,
+}
+
+# Pure theme data (no Tkinter objects)
+THEMES = {
+    "dark": {
+        "bg": "#0d1117",
+        "frame_bg": "#161b22",
+        "text": "#c9d1d9",
+        "text_secondary": "#8b949e",
+        "text_bright": "#f0f6fc",
+        "accent": "#58a6ff",
+        "accent_secondary": "#79c0ff",
+        "select_bg": "#21262d",
+        "input_bg": "#0d1117",
+        "input_fg": "#c9d1d9",
+        "output_fg": "#79c0ff",
+    },
+    "light": {
+        "bg": "#ffffff",
+        "frame_bg": "#f6f8fa",
+        "text": "#24292f",
+        "text_secondary": "#57606a",
+        "text_bright": "#1f2328",
+        "accent": "#0969da",
+        "accent_secondary": "#0550ae",
+        "select_bg": "#ddf4ff",
+        "input_bg": "#ffffff",
+        "input_fg": "#24292f",
+        "output_fg": "#0550ae",
+    }
+}
+
+# Footer links
+LINKS = [
+    ("GitHub", "https://github.com/totalbrain/TokenOptimizer"),
+    ("Roadmap", "https://github.com/users/totalbrain/projects/1")
+]

src/__init__.py

@@ -0,0 +1,34 @@
+# src/optimizations.py
+import re
+
+def apply_optimizations(options, text):
+    if options["remove_comments"].get():
+        text = re.sub(r'#.*', '', text)
+        text = re.sub(r'"""[\s\S]*?"""|\'\'\'[\s\S]*?\'\'\'', '', text)
+    if options["remove_docstrings"].get():
+        text = re.sub(r'^[\r\n\s]*("""|\'\'\').*?\1', '', text, count=1, flags=re.DOTALL)
+    if options["remove_blank_lines"].get():
+        text = "\n".join(line for line in text.splitlines() if line.strip())
+    if options["remove_extra_spaces"].get():
+        text = re.sub(r'[ \t]+', ' ', text)
+    if options["single_line_mode"].get():
+        text = text.replace("\n", "⏎")
+    if options["shorten_keywords"].get():
+        rep = {"def ": "d ", "return ": "r ", "import ": "i ", "from ": "f ", "as ": "a ", "if ": "if", "class ": "c ", "lambda ": "λ "}
+        for k, v in rep.items():
+            text = text.replace(k, v)
+    if options["replace_booleans"].get():
+        text = text.replace("True", "1").replace("False", "0").replace("None", "~")
+    if options["use_short_operators"].get():
+        text = text.replace("==", "≡").replace("!=", "≠").replace(" and ", "∧").replace(" or ", "∨")
+    if options["remove_type_hints"].get():
+        text = re.sub(r':\s*[^=\n\->]+', '', text)
+        text = re.sub(r'->\s*[^:\n]+', '', text)
+    if options["minify_structures"].get():
+        text = re.sub(r',\s+', ',', text)
+        text = re.sub(r':\s+', ':', text)
+    if options["unicode_shortcuts"].get():
+        text = text.replace(" in ", "∈").replace(" not in ", "∉")
+    if options["shorten_print"].get():
+        text = re.sub(r'print\s*\(', 'p(', text)
+    return text.strip() + "\n"