From 3685f258822712b5a94b9de6e767f86437d3da1c Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sat, 25 Jan 2025 14:05:10 +0100 Subject: [PATCH] Made the project also work with "pip install ." (without "-e") --- setup.py | 4 ++-- wobuzz/command_line.py | 30 ++++++++++++++++------------ wobuzz/gui_communication/__init__.py | 1 + wobuzz/library/__init__.py | 1 + wobuzz/main.py | 2 +- wobuzz/ui/__init__.py | 1 + wobuzz/ui/settings/__init__.py | 1 + 7 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 wobuzz/gui_communication/__init__.py create mode 100644 wobuzz/library/__init__.py create mode 100644 wobuzz/ui/__init__.py create mode 100644 wobuzz/ui/settings/__init__.py diff --git a/setup.py b/setup.py index ff0ecfd..e86c545 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setuptools.setup( url="https://teapot.informationsanarchistik.de/Wobbl/Wobuzz", author="The Wobbler", author_email="emil@i21k.de", - packages=["wobuzz"], + packages=setuptools.find_packages(include=["wobuzz", "wobuzz.*"]), package_data={"": ["*.txt"]}, install_requires=[ "PyQt6", @@ -26,6 +26,6 @@ setuptools.setup( "wobbl_tools @ git+https://teapot.informationsanarchistik.de/Wobbl/wobbl_tools@main#egg=wobbl_tools" ], entry_points={ - "console_scripts": ["wobuzz=wobuzz.command_line"], + "console_scripts": ["wobuzz=wobuzz.command_line:main"], } ) diff --git a/wobuzz/command_line.py b/wobuzz/command_line.py index 605db72..cd6db53 100644 --- a/wobuzz/command_line.py +++ b/wobuzz/command_line.py @@ -5,25 +5,29 @@ import argparse from .main import Wobuzz -description = "A music player made by The Wobbler." +def main(): + description = "A music player made by The Wobbler." -parser = argparse.ArgumentParser(description=description) + parser = argparse.ArgumentParser(description=description) -parser.add_argument("track", nargs="*", help="Plays audio files the from given paths.", metavar="TRACKS") -parser.add_argument("-p", "--playlist", help="Imports a playlist from the given path.", metavar="PLAYLIST_PATH") + parser.add_argument("track", nargs="*", help="Plays audio files the from given paths.", metavar="TRACKS") + parser.add_argument("-p", "--playlist", help="Imports a playlist from the given path.", metavar="PLAYLIST_PATH") -arguments = parser.parse_args() + arguments = parser.parse_args() -app = Wobuzz() + app = Wobuzz() -if arguments.playlist: - app.library.temporary_playlist.load_from_m3u(arguments.playlist) + if arguments.playlist: + app.library.temporary_playlist.load_from_m3u(arguments.playlist) -if arguments.track: - app.library.temporary_playlist.load_from_paths(arguments.track) + if arguments.track: + app.library.temporary_playlist.load_from_paths(arguments.track) -app.player.current_playlist = app.library.temporary_playlist -app.library.create_playlist_views() + app.player.current_playlist = app.library.temporary_playlist + app.library.create_playlist_views() -sys.exit(app.qt_app.exec()) + sys.exit(app.qt_app.exec()) + +if __name__ == "__main__": + main() diff --git a/wobuzz/gui_communication/__init__.py b/wobuzz/gui_communication/__init__.py new file mode 100644 index 0000000..a93a4bf --- /dev/null +++ b/wobuzz/gui_communication/__init__.py @@ -0,0 +1 @@ +#!/usr/bin/python3 diff --git a/wobuzz/library/__init__.py b/wobuzz/library/__init__.py new file mode 100644 index 0000000..a93a4bf --- /dev/null +++ b/wobuzz/library/__init__.py @@ -0,0 +1 @@ +#!/usr/bin/python3 diff --git a/wobuzz/main.py b/wobuzz/main.py index d666301..bb89353 100644 --- a/wobuzz/main.py +++ b/wobuzz/main.py @@ -5,7 +5,7 @@ from PyQt6.QtWidgets import QApplication from wobbl_tools.data_file import load_dataclass_json from .settings import Settings from .utils import Utils -from .player.player import Player +from .player import Player from .library.library import Library from .gui import GUI from .gui_communication.gui_communication import GUICommunication diff --git a/wobuzz/ui/__init__.py b/wobuzz/ui/__init__.py new file mode 100644 index 0000000..a93a4bf --- /dev/null +++ b/wobuzz/ui/__init__.py @@ -0,0 +1 @@ +#!/usr/bin/python3 diff --git a/wobuzz/ui/settings/__init__.py b/wobuzz/ui/settings/__init__.py new file mode 100644 index 0000000..a93a4bf --- /dev/null +++ b/wobuzz/ui/settings/__init__.py @@ -0,0 +1 @@ +#!/usr/bin/python3