From f592fba858b4c48f0fe08783974a8a688e59e42f Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Wed, 15 Jun 2022 15:40:43 +0200 Subject: [PATCH] move music providers into top level folder --- music_assistant/controllers/music/__init__.py | 15 +++++++-------- music_assistant/controllers/music/albums.py | 2 +- music_assistant/controllers/music/artists.py | 2 +- .../models/{provider.py => music_provider.py} | 0 .../providers => music_providers}/__init__.py | 0 .../providers => music_providers}/filesystem.py | 2 +- .../librespot/linux/librespot-aarch64 | Bin .../librespot/linux/librespot-arm | Bin .../librespot/linux/librespot-armhf | Bin .../librespot/linux/librespot-armv7 | Bin .../librespot/linux/librespot-x86_64 | Bin .../librespot/osx/librespot | Bin .../librespot/windows/librespot.exe | Bin .../music/providers => music_providers}/qobuz.py | 2 +- .../providers => music_providers}/spotify.py | 2 +- .../providers => music_providers}/tunein.py | 2 +- .../music/providers => music_providers}/url.py | 2 +- 17 files changed, 14 insertions(+), 15 deletions(-) rename music_assistant/models/{provider.py => music_provider.py} (100%) rename music_assistant/{controllers/music/providers => music_providers}/__init__.py (100%) rename music_assistant/{controllers/music/providers => music_providers}/filesystem.py (99%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/linux/librespot-aarch64 (100%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/linux/librespot-arm (100%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/linux/librespot-armhf (100%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/linux/librespot-armv7 (100%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/linux/librespot-x86_64 (100%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/osx/librespot (100%) rename music_assistant/{controllers/music/providers => music_providers}/librespot/windows/librespot.exe (100%) rename music_assistant/{controllers/music/providers => music_providers}/qobuz.py (99%) rename music_assistant/{controllers/music/providers => music_providers}/spotify.py (99%) rename music_assistant/{controllers/music/providers => music_providers}/tunein.py (99%) rename music_assistant/{controllers/music/providers => music_providers}/url.py (97%) diff --git a/music_assistant/controllers/music/__init__.py b/music_assistant/controllers/music/__init__.py index abd47961..8f6a4d88 100755 --- a/music_assistant/controllers/music/__init__.py +++ b/music_assistant/controllers/music/__init__.py @@ -21,14 +21,13 @@ from music_assistant.models.config import MusicProviderConfig from music_assistant.models.enums import MediaType, ProviderType from music_assistant.models.errors import MusicAssistantError, SetupFailedError from music_assistant.models.media_items import MediaItem, MediaItemType -from music_assistant.models.provider import MusicProvider - -from .providers.filesystem import FileSystemProvider -from .providers.qobuz import QobuzProvider -from .providers.spotify import SpotifyProvider -from .providers.tunein import TuneInProvider -from .providers.url import PROVIDER_CONFIG as URL_CONFIG -from .providers.url import URLProvider +from music_assistant.models.music_provider import MusicProvider +from music_assistant.music_providers.filesystem import FileSystemProvider +from music_assistant.music_providers.qobuz import QobuzProvider +from music_assistant.music_providers.spotify import SpotifyProvider +from music_assistant.music_providers.tunein import TuneInProvider +from music_assistant.music_providers.url import PROVIDER_CONFIG as URL_CONFIG +from music_assistant.music_providers.url import URLProvider if TYPE_CHECKING: from music_assistant.mass import MusicAssistant diff --git a/music_assistant/controllers/music/albums.py b/music_assistant/controllers/music/albums.py index 7b5df973..043f4445 100644 --- a/music_assistant/controllers/music/albums.py +++ b/music_assistant/controllers/music/albums.py @@ -21,7 +21,7 @@ from music_assistant.models.media_items import ( MediaType, Track, ) -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider class AlbumsController(MediaControllerBase[Album]): diff --git a/music_assistant/controllers/music/artists.py b/music_assistant/controllers/music/artists.py index 56fd477d..1476153d 100644 --- a/music_assistant/controllers/music/artists.py +++ b/music_assistant/controllers/music/artists.py @@ -19,7 +19,7 @@ from music_assistant.models.media_items import ( MediaType, Track, ) -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider class ArtistsController(MediaControllerBase[Artist]): diff --git a/music_assistant/models/provider.py b/music_assistant/models/music_provider.py similarity index 100% rename from music_assistant/models/provider.py rename to music_assistant/models/music_provider.py diff --git a/music_assistant/controllers/music/providers/__init__.py b/music_assistant/music_providers/__init__.py similarity index 100% rename from music_assistant/controllers/music/providers/__init__.py rename to music_assistant/music_providers/__init__.py diff --git a/music_assistant/controllers/music/providers/filesystem.py b/music_assistant/music_providers/filesystem.py similarity index 99% rename from music_assistant/controllers/music/providers/filesystem.py rename to music_assistant/music_providers/filesystem.py index e5ad97db..6658cb38 100644 --- a/music_assistant/controllers/music/providers/filesystem.py +++ b/music_assistant/music_providers/filesystem.py @@ -40,7 +40,7 @@ from music_assistant.models.media_items import ( StreamDetails, Track, ) -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider FALLBACK_ARTIST = "Various Artists" SPLITTERS = (";", ",", "Featuring", " Feat. ", " Feat ", "feat.", " & ", " / ") diff --git a/music_assistant/controllers/music/providers/librespot/linux/librespot-aarch64 b/music_assistant/music_providers/librespot/linux/librespot-aarch64 similarity index 100% rename from music_assistant/controllers/music/providers/librespot/linux/librespot-aarch64 rename to music_assistant/music_providers/librespot/linux/librespot-aarch64 diff --git a/music_assistant/controllers/music/providers/librespot/linux/librespot-arm b/music_assistant/music_providers/librespot/linux/librespot-arm similarity index 100% rename from music_assistant/controllers/music/providers/librespot/linux/librespot-arm rename to music_assistant/music_providers/librespot/linux/librespot-arm diff --git a/music_assistant/controllers/music/providers/librespot/linux/librespot-armhf b/music_assistant/music_providers/librespot/linux/librespot-armhf similarity index 100% rename from music_assistant/controllers/music/providers/librespot/linux/librespot-armhf rename to music_assistant/music_providers/librespot/linux/librespot-armhf diff --git a/music_assistant/controllers/music/providers/librespot/linux/librespot-armv7 b/music_assistant/music_providers/librespot/linux/librespot-armv7 similarity index 100% rename from music_assistant/controllers/music/providers/librespot/linux/librespot-armv7 rename to music_assistant/music_providers/librespot/linux/librespot-armv7 diff --git a/music_assistant/controllers/music/providers/librespot/linux/librespot-x86_64 b/music_assistant/music_providers/librespot/linux/librespot-x86_64 similarity index 100% rename from music_assistant/controllers/music/providers/librespot/linux/librespot-x86_64 rename to music_assistant/music_providers/librespot/linux/librespot-x86_64 diff --git a/music_assistant/controllers/music/providers/librespot/osx/librespot b/music_assistant/music_providers/librespot/osx/librespot similarity index 100% rename from music_assistant/controllers/music/providers/librespot/osx/librespot rename to music_assistant/music_providers/librespot/osx/librespot diff --git a/music_assistant/controllers/music/providers/librespot/windows/librespot.exe b/music_assistant/music_providers/librespot/windows/librespot.exe similarity index 100% rename from music_assistant/controllers/music/providers/librespot/windows/librespot.exe rename to music_assistant/music_providers/librespot/windows/librespot.exe diff --git a/music_assistant/controllers/music/providers/qobuz.py b/music_assistant/music_providers/qobuz.py similarity index 99% rename from music_assistant/controllers/music/providers/qobuz.py rename to music_assistant/music_providers/qobuz.py index 65bbc48a..ffb4c37b 100644 --- a/music_assistant/controllers/music/providers/qobuz.py +++ b/music_assistant/music_providers/qobuz.py @@ -33,7 +33,7 @@ from music_assistant.models.media_items import ( StreamDetails, Track, ) -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider class QobuzProvider(MusicProvider): diff --git a/music_assistant/controllers/music/providers/spotify.py b/music_assistant/music_providers/spotify.py similarity index 99% rename from music_assistant/controllers/music/providers/spotify.py rename to music_assistant/music_providers/spotify.py index 83d1f85f..56912c1e 100644 --- a/music_assistant/controllers/music/providers/spotify.py +++ b/music_assistant/music_providers/spotify.py @@ -36,7 +36,7 @@ from music_assistant.models.media_items import ( StreamDetails, Track, ) -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider CACHE_DIR = gettempdir() diff --git a/music_assistant/controllers/music/providers/tunein.py b/music_assistant/music_providers/tunein.py similarity index 99% rename from music_assistant/controllers/music/providers/tunein.py rename to music_assistant/music_providers/tunein.py index fe6ef60a..239896d4 100644 --- a/music_assistant/controllers/music/providers/tunein.py +++ b/music_assistant/music_providers/tunein.py @@ -21,7 +21,7 @@ from music_assistant.models.media_items import ( Radio, StreamDetails, ) -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider class TuneInProvider(MusicProvider): diff --git a/music_assistant/controllers/music/providers/url.py b/music_assistant/music_providers/url.py similarity index 97% rename from music_assistant/controllers/music/providers/url.py rename to music_assistant/music_providers/url.py index 1dbb50f8..1e82483f 100644 --- a/music_assistant/controllers/music/providers/url.py +++ b/music_assistant/music_providers/url.py @@ -12,7 +12,7 @@ from music_assistant.helpers.audio import ( from music_assistant.models.config import MusicProviderConfig from music_assistant.models.enums import ContentType, MediaType, ProviderType from music_assistant.models.media_items import MediaItemType, StreamDetails -from music_assistant.models.provider import MusicProvider +from music_assistant.models.music_provider import MusicProvider PROVIDER_CONFIG = MusicProviderConfig(ProviderType.URL) -- 2.34.1