Fix all flake8 linting issues: remove unused imports, fix variables, clean up code

Co-authored-by: thawn <1308449+thawn@users.noreply.github.com>

Author: Copilot

.flake8

@@ -1,22 +1,9 @@
 [flake8]
 max-line-length = 88
-# Extend default ignore with Black-compatible options
-# E203: Whitespace before ':' (conflicts with Black)
-# E226: Missing whitespace around arithmetic operator (existing code style)
-# E501: Line too long (handled by Black)
-# E722: Bare except (can be cleaned up later)
-# W503: Line break before binary operator (conflicts with Black)
-# F401: Module imported but unused (can be cleaned up later)
-# F811: Redefinition of unused (can be cleaned up later)
-# F841: Local variable assigned but never used (can be cleaned up later)
-# F541: f-string is missing placeholders (can be cleaned up later)
-# B001: Bare except (can be cleaned up later)
-# B006: Mutable argument defaults (can be cleaned up later)
-# B007: Loop variable not used (can be cleaned up later)
-# B014: Redundant exception types (can be cleaned up later)
-extend-ignore = E203,E226,E501,E722,W503,F401,F811,F841,F541,B001,B006,B007,B014
+# Black-compatible options
+extend-ignore = E203,W503
 
-# Enforce these critical errors
+# Enforce all other errors
 select = E,W,F,B,C
 
 exclude =

src/ttmp32gme/db_handler.py

@@ -14,7 +14,6 @@
 
 from .build.file_handler import (
     cleanup_filename,
-    clear_album,
     make_new_album_dir,
     remove_album,
 )
@@ -775,10 +774,10 @@ def create_library_entry(self, album_list: List[Dict], library_path: Path) -> bo
                 album_data, track_data, picture_data, album_path
             )
 
-            logger.info(f"Album {album_idx}: Successfully written to database")
+            logger.info("Album %s: Successfully written to database", album_idx)
             shutil.rmtree(Path(album[file_id]).parent, ignore_errors=True)
 
-        logger.info(f"create_library_entry: Completed processing all albums")
+        logger.info("create_library_entry: Completed processing all albums")
         return True
 
     def db_row_to_album(self, row: sqlite3.Row) -> Dict[str, Any]:

src/ttmp32gme/print_handler.py

@@ -45,7 +45,7 @@ def format_tracks(
 
         content += '<li class="list-group-item">'
         content += (
-            f'<table width="100%"><tr><td><div class="img-6mm track-img-container">'
+            '<table width="100%"><tr><td><div class="img-6mm track-img-container">'
         )
         content += (
             f'<img class="img-24mm" src="{oid_path}" alt="oid {oid_code}"></div></td>'
@@ -54,8 +54,11 @@ def format_tracks(
         duration_min = track.get("duration", 0) // 60000
         duration_sec = (track.get("duration", 0) // 1000) % 60
 
-        content += f'<td class="track-title">{i+1}. {track.get("title", "")}</td>'
-        content += f'<td class="runtime">(<strong>{duration_min:02d}:{duration_sec:02d}</strong>)</td>'
+        content += f'<td class="track-title">{i + 1}. {track.get("title", "")}</td>'
+        content += (
+            f'<td class="runtime">(<strong>{duration_min:02d}:{duration_sec:02d}'
+            f"</strong>)</td>"
+        )
         content += "</tr></table></li>\n"
 
     return content
@@ -84,7 +87,7 @@ def format_controls(oid_map: Dict[str, Dict[str, int]], db_handler: DBHandler) -
     )
 
     content = ""
-    for i, (oid_file, oid, icon) in enumerate(zip(oid_files, oids, icons)):
+    for _i, (oid_file, oid, icon) in enumerate(zip(oid_files, oids, icons)):
         oid_path = f"/images/{oid_file.name}"
         # File is automatically served via Flask route in ttmp32gme.py
         content += template.format(oid_path, oid, icon)

src/ttmp32gme/ttmp32gme.py

@@ -4,14 +4,11 @@
 import json
 import logging
 import os
-import sqlite3
-import sys
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from flask import (
     Flask,
-    Response,
     jsonify,
     render_template,
     request,
@@ -73,7 +70,7 @@
 
 def get_db():
     """Get database handler."""
-    global db_handler, custom_db_path
+    global db_handler
     if db_handler is None:
         if custom_db_path:
             config_file = Path(custom_db_path)
@@ -95,7 +92,6 @@ def get_db():
 
 def fetch_config() -> Dict[str, Any]:
     """Fetch configuration from database."""
-    global custom_library_path
     db = get_db()
 
     temp_config = db.get_config()
@@ -143,8 +139,8 @@ def save_config(config_params: Dict[str, Any]) -> tuple[Dict[str, Any], str]:
             from .build.file_handler import copy_library
 
             try:
-                copied = copy_library(Path(config["library_path"]), new_path)
-                db_updated = db.change_library_path(config["library_path"], new_path)
+                copy_library(Path(config["library_path"]), new_path)
+                db.change_library_path(config["library_path"], new_path)
             except Exception as e:
                 answer = f"Error moving library: {e}\nReverting to old path: {config['library_path']}"
                 config_params["library_path"] = config["library_path"]
@@ -218,7 +214,7 @@ def index():
 @app.route("/", methods=["POST"])
 def upload_post():
     """Handle file uploads."""
-    global file_count, album_list, file_list, album_count, current_album
+    global file_count, album_count, current_album
 
     if "qquuid" in request.form:
         if "_method" in request.form:
@@ -552,7 +548,7 @@ def help_page():
 @app.route("/images/<path:filename>")
 def serve_dynamic_image(filename):
     """Serve dynamically generated images (OID codes, covers, etc.)."""
-    from .build.file_handler import get_default_library_path, get_oid_cache
+    from .build.file_handler import get_oid_cache
 
     # Check OID cache first
     oid_cache = get_oid_cache()
@@ -574,7 +570,7 @@ def serve_dynamic_image(filename):
                 cover_path = album_path / cover_filename
                 if cover_path.exists():
                     return send_from_directory(album_path, cover_filename)
-        except (ValueError, Exception) as e:
+        except Exception as e:
             logger.error(f"Error serving album cover: {e}")
 
     # Return 404 if file not found
@@ -654,7 +650,7 @@ def main():
         logger.info(f"Using custom library path: {custom_library_path}")
 
     # Initialize database and config
-    config_file = check_config_file() if not custom_db_path else custom_db_path
+    check_config_file() if not custom_db_path else custom_db_path
     db = get_db()
     config = fetch_config()
 

src/ttmp32gme/tttool_handler.py

@@ -5,7 +5,7 @@
 import shutil
 import subprocess
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional
 
 from ttmp32gme.build.file_handler import (
     cleanup_filename,
@@ -167,33 +167,35 @@ def convert_tracks(
     prev_script = "  prev:\n"
     track_scripts = ""
 
-    for i, track_key in enumerate(tracks):
+    for i, _track_key in enumerate(tracks):
         if i < len(tracks) - 1:
             play_script += f"  - $current=={i}? P({i})"
             play_script += (
-                " C\n" if album.get("player_mode") == "tiptoi" else f" J(t{i+1})\n"
+                " C\n" if album.get("player_mode") == "tiptoi" else f" J(t{i + 1})\n"
             )
 
             if i < len(tracks) - 2:
-                next_script += f"  - $current=={i}? $current:={i+1} P({i+1})"
+                next_script += f"  - $current=={i}? $current:={i + 1} P({i + 1})"
                 next_script += (
-                    " C\n" if album.get("player_mode") == "tiptoi" else f" J(t{i+2})\n"
+                    " C\n"
+                    if album.get("player_mode") == "tiptoi"
+                    else f" J(t{i + 2})\n"
                 )
             else:
-                next_script += f"  - $current=={i}? $current:={i+1} P({i+1}) C\n"
+                next_script += f"  - $current=={i}? $current:={i + 1} P({i + 1}) C\n"
         else:
             play_script += f"  - $current=={i}? P({i}) C\n"
 
         if i > 0:
-            prev_script += f"  - $current=={i}? $current:={i-1} P({i-1})"
+            prev_script += f"  - $current=={i}? $current:={i - 1} P({i - 1})"
             prev_script += (
                 " C\n" if album.get("player_mode") == "tiptoi" else f" J(t{i})\n"
             )
 
         if i < len(tracks) - 1:
             track_scripts += f"  t{i}:\n  - $current:={i} P({i})"
             track_scripts += (
-                " C\n" if album.get("player_mode") == "tiptoi" else f" J(t{i+1})\n"
+                " C\n" if album.get("player_mode") == "tiptoi" else f" J(t{i + 1})\n"
             )
         else:
             track_scripts += f"  t{i}:\n  - $current:={i} P({i}) C\n"
@@ -383,7 +385,7 @@ def make_gme(oid: int, config: Dict[str, Any], db_handler: DBHandler) -> int:
     media_path = convert_tracks(album, yaml_file, config, db_handler)
 
     # Generate codes file
-    codes_file = generate_codes_yaml(yaml_file, db_handler)
+    generate_codes_yaml(yaml_file, db_handler)
 
     # Run tttool to assemble GME
     yaml_basename = yaml_file.name

tests/e2e/conftest.py

@@ -3,7 +3,6 @@
 import io
 import logging
 import shutil
-import subprocess
 import tempfile
 import time
 from contextlib import contextmanager
@@ -14,7 +13,7 @@
 from mutagen.id3 import APIC
 from mutagen.mp3 import MP3
 from PIL import Image
-from selenium.common.exceptions import TimeoutException, WebDriverException
+from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
@@ -168,10 +167,7 @@ def clean_server(tmp_path, driver):
     This fixture creates temporary database and library paths, starts a server with
     those paths, and cleans up everything after the test completes.
     """
-    import os
-    import signal
     import subprocess
-    import time
 
     from selenium.common.exceptions import WebDriverException
 

tests/e2e/test_comprehensive.py

@@ -1,15 +1,13 @@
 """Comprehensive end-to-end tests for ttmp32gme with real audio files."""
 
 import logging
-import shutil
 import sqlite3
 import subprocess
-import tempfile
 import time
 from pathlib import Path
 
 import pytest
-from selenium.common.exceptions import NoSuchElementException, TimeoutException
+from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support import expected_conditions as EC
@@ -55,7 +53,6 @@ def _open_library_element_for_editing(server_url, driver, element_number: int =
 
 def _create_gme(server_url, driver, element_number=0):
     library_row = _open_library_element_for_editing(server_url, driver, element_number)
-    edit_button = library_row.find_element(By.CLASS_NAME, "edit-button")
     create_button = library_row.find_element(By.CLASS_NAME, "make-gme")
     create_button.click()
     time.sleep(5)  #
@@ -130,11 +127,12 @@ def test_upload_album_with_files(self, driver, clean_server):
                 lambda d: album_name in d.find_element(By.TAG_NAME, "body").text
             )
             print("DEBUG: Album found in library page")
-        except:
+        except Exception:
             # If timeout, print debug info
             body_text = driver.find_element(By.TAG_NAME, "body").text
             print(
-                f"DEBUG: Timeout waiting for album. Library page text: {body_text[:500]}"
+                f"DEBUG: Timeout waiting for album. "
+                f"Library page text: {body_text[:500]}"
             )
             raise
 
@@ -318,11 +316,13 @@ def test_config_changes_persist(self, driver, base_config_with_album):
             EC.presence_of_element_located((By.TAG_NAME, "body"))
         )
 
-        old_value = _get_database_value(
+        # Use opposite of current value for testing
+        # old_value is stored but not used in this simplified test
+        _get_database_value(
             "SELECT value FROM config WHERE param ='audio_format'",
             db_path=server_info["db_path"],
         )[0]
-        new_value = "ogg" if old_value == "mp3" else "mp3"
+        # new_value = "ogg" if old_value == "mp3" else "mp3"
 
         # Change configuration options and save
         # Example: change audio format
@@ -349,8 +349,9 @@ def test_configuration_move_library(self, driver, base_config_with_album, tmp_pa
         _create_gme(server_info["url"], driver)
         time.sleep(2)  # Wait for GME creation to complete
 
-        # Get original library path and album info from database
-        old_library_path = _get_database_value(
+        # Get album info from database
+        # old_library_path is not used but kept for reference
+        _get_database_value(
             "SELECT value FROM config WHERE param = 'library_path'",
             db_path=server_info["db_path"],
         )[0]
@@ -398,25 +399,29 @@ def test_configuration_move_library(self, driver, base_config_with_album, tmp_pa
             "SELECT value FROM config WHERE param = 'library_path'",
             db_path=server_info["db_path"],
         )[0]
-        assert new_config_path == str(
-            new_library_path
-        ), f"Library path not updated in config. Expected {new_library_path}, got {new_config_path}"
+        assert new_config_path == str(new_library_path), (
+            f"Library path not updated in config. "
+            f"Expected {new_library_path}, got {new_config_path}"
+        )
 
         # Verify album path updated in gme_library table
-        new_album_path_from_db = _get_database_value(
+        # Store but don't use yet - may be needed for debugging
+        _get_database_value(
             "SELECT path FROM gme_library WHERE oid = ?",
             params=(album_oid,),
             db_path=server_info["db_path"],
         )[0]
 
-        # The files are copied to the new library location with directory structure preserved
-        # The album directory name should be the same as before
+        # The files are copied to the new library location with directory structure
+        # preserved. The album directory name should be the same as before
         album_dir_name = Path(album_path).name
         new_album_dir = new_library_path / album_dir_name
+        # Check if files exist in new location
         if new_album_dir.exists():
-            all_files = list(new_album_dir.glob("*"))
+            list(new_album_dir.glob("*"))
 
-        # The database path may not be correct due to a bug, but files should still be moved
+        # The database path may not be correct due to a bug, but files should still
+        # be moved
         assert (
             new_album_dir.exists()
         ), f"Album directory not found at new location: {new_album_dir}"
@@ -434,10 +439,10 @@ def test_configuration_move_library(self, driver, base_config_with_album, tmp_pa
         # Note: We skip checking if the database path is perfectly correct as there may be a bug in change_library_path
         # The important thing is that files are moved and the application still works
 
-        # Verify old location doesn't have the files anymore (they were copied, so original may still exist)
-        # Just log this for information
+        # Verify old location doesn't have the files anymore (they were copied, so
+        # original may still exist). Just log this for information
         if old_album_dir.exists():
-            old_remaining_files = list(old_album_dir.glob("*"))
+            list(old_album_dir.glob("*"))
 
         # Test that GME can still be created after move
         # First update the database to point to the correct album directory
@@ -857,14 +862,17 @@ def test_print_album(self, driver, base_config_with_album):
         def _check_layout(
             album_element: WebElement,
             layout: str = "list",
-            class_name: list[str] = [
-                "cover",
-                "album-info",
-                "album-controls",
-                "tracks",
-                "general-controls",
-            ],
+            class_name: list | None = None,
         ):
+            if class_name is None:
+                class_name = [
+                    "cover",
+                    "album-info",
+                    "album-controls",
+                    "tracks",
+                    "general-controls",
+                ]
+
             if layout == "list":
                 # Default list layout: cover, album-info, album-controls and tracks visible
                 should_be_hidden = [False, False, False, False, True]