From 6061590270d1c809258f9fd4d5b4a61fd8b5fa89 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 22 May 2025 22:52:08 +0200
Subject: [PATCH] Move source code to src/leek

This makes the package work again
---
 MANIFEST.in                |  2 +-
 pyproject.toml             |  5 -----
 src/__main__.py            |  3 ---
 src/{ => leek}/Main.qml    |  0
 src/{ => leek}/__init__.py |  0
 src/leek/__main__.py       | 14 ++++++++++++++
 src/{ => leek}/leek_app.py |  0
 src/{ => leek}/mod.py      |  0
 src/{ => leek}/mod_list.py |  2 +-
 9 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 src/__main__.py
 rename src/{ => leek}/Main.qml (100%)
 rename src/{ => leek}/__init__.py (100%)
 create mode 100644 src/leek/__main__.py
 rename src/{ => leek}/leek_app.py (100%)
 rename src/{ => leek}/mod.py (100%)
 rename src/{ => leek}/mod_list.py (97%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 07aaf32..b09452c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include src/*.qml
+include src/leek/*.qml
diff --git a/pyproject.toml b/pyproject.toml
index e351033..cffc5af 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,11 +27,6 @@ content-type = "text/markdown"
 [project.scripts]
 leek = "leek.leek_app:main"
 
-[tool.setuptools]
-packages = ["leek"]
-package-dir = {leek = "src"}
-include-package-data = true
-
 [tool.ruff.lint]
 select = [
     # Defaults
diff --git a/src/__main__.py b/src/__main__.py
deleted file mode 100644
index 657f854..0000000
--- a/src/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import leek_app
-
-leek_app.main()
diff --git a/src/Main.qml b/src/leek/Main.qml
similarity index 100%
rename from src/Main.qml
rename to src/leek/Main.qml
diff --git a/src/__init__.py b/src/leek/__init__.py
similarity index 100%
rename from src/__init__.py
rename to src/leek/__init__.py
diff --git a/src/leek/__main__.py b/src/leek/__main__.py
new file mode 100644
index 0000000..d2168e2
--- /dev/null
+++ b/src/leek/__main__.py
@@ -0,0 +1,14 @@
+# https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/#running-a-command-line-interface-from-source-with-src-layout
+import os
+import sys
+
+if not __package__:
+    # Make CLI runnable from source tree with
+    #    python src/package
+    package_source_path = os.path.dirname(os.path.dirname(__file__))
+    sys.path.insert(0, package_source_path)
+
+
+from leek import leek_app
+
+leek_app.main()
diff --git a/src/leek_app.py b/src/leek/leek_app.py
similarity index 100%
rename from src/leek_app.py
rename to src/leek/leek_app.py
diff --git a/src/mod.py b/src/leek/mod.py
similarity index 100%
rename from src/mod.py
rename to src/leek/mod.py
diff --git a/src/mod_list.py b/src/leek/mod_list.py
similarity index 97%
rename from src/mod_list.py
rename to src/leek/mod_list.py
index 5105f7b..7bcf644 100644
--- a/src/mod_list.py
+++ b/src/leek/mod_list.py
@@ -1,6 +1,6 @@
 from PySide6.QtQml import QmlElement
 from PySide6.QtCore import QAbstractListModel, QModelIndex
-from mod import Mod, InvalidModError
+from leek.mod import Mod, InvalidModError
 import os
 
 QML_IMPORT_NAME = "Leek"