refactor: tree structure

klepp0 · Jul 4, 2024 · 3aeeb29 · 3aeeb29
1 parent 5889dd5
commit 3aeeb29
Show file tree

Hide file tree

Showing 33 changed files with 40 additions and 31 deletions.
diff --git a/musync/__init__.py b/musync/__init__.py
@@ -0,0 +1,3 @@
+from pathlib import Path
+
+ROOT_DIR = Path(__file__).parent.parent.resolve()
diff --git a/musync/common/__init__.py b/musync/common/__init__.py
@@ -0,0 +1,2 @@
+from .session import Session
+from .sync_manager import SyncManager
diff --git a/musync/entity/__init__.py → musync/common/entity/__init__.py b/musync/entity/__init__.py → musync/common/entity/__init__.py
diff --git a/musync/entity/artist.py → musync/common/entity/artist.py b/musync/entity/artist.py → musync/common/entity/artist.py
@@ -4,7 +4,7 @@
 
 import tidalapi as tidal
 
-from musync.entity.origin import Origin
+from musync.common.entity.origin import Origin
 
 
 @dataclass(frozen=True, slots=True)

diff --git a/musync/entity/origin.py → musync/common/entity/origin.py b/musync/entity/origin.py → musync/common/entity/origin.py
diff --git a/musync/entity/playlist.py → musync/common/entity/playlist.py b/musync/entity/playlist.py → musync/common/entity/playlist.py
@@ -4,7 +4,7 @@
 
 import tidalapi as tidal
 
-from musync.entity.origin import Origin
+from musync.common.entity.origin import Origin
 
 
 @dataclass(frozen=True, slots=True)

diff --git a/musync/entity/track.py → musync/common/entity/track.py b/musync/entity/track.py → musync/common/entity/track.py
@@ -8,8 +8,8 @@
 import pytz
 import tidalapi
 
-from musync.entity.origin import Origin
-from musync.entity.utils import normalize_str
+from musync.common.entity.origin import Origin
+from musync.common.entity.utils import normalize_str
 
 
 @dataclass(frozen=True, slots=True)

diff --git a/musync/entity/user.py → musync/common/entity/user.py b/musync/entity/user.py → musync/common/entity/user.py
@@ -4,7 +4,7 @@
 
 import tidalapi as tidal
 
-from musync.entity.origin import Origin
+from musync.common.entity.origin import Origin
 
 
 @dataclass(frozen=True, slots=True)

diff --git a/musync/entity/utils.py → musync/common/entity/utils.py b/musync/entity/utils.py → musync/common/entity/utils.py
diff --git a/musync/error.py → musync/common/error.py b/musync/error.py → musync/common/error.py
diff --git a/musync/session.py → musync/common/session.py b/musync/session.py → musync/common/session.py
@@ -4,7 +4,7 @@
 import spotipy
 import tidalapi
 
-from musync.entity import Playlist, Track, User
+from musync.common.entity import Playlist, Track, User
 
 
 class Session(ABC):

diff --git a/musync/sync_manager.py → musync/common/sync_manager.py b/musync/sync_manager.py → musync/common/sync_manager.py
@@ -1,7 +1,7 @@
 import warnings
 
-from musync.entity import Playlist, Track
-from musync.error import MissingPrivilegesError, TrackNotFoundWarning
+from musync.common.entity import Playlist, Track
+from musync.common.error import MissingPrivilegesError, TrackNotFoundWarning
 from musync.spotify import SpotifySession
 from musync.tidal import TidalSession
 

diff --git a/musync/spotify/session.py b/musync/spotify/session.py
@@ -4,8 +4,8 @@
 import spotipy
 from dotenv import load_dotenv
 
-from musync.entity import Artist, Origin, Playlist, Track, User
-from musync.session import Session
+from musync.common.entity import Artist, Origin, Playlist, Track, User
+from musync.common import Session
 
 load_dotenv()
 

diff --git a/musync/tidal/session.py b/musync/tidal/session.py
@@ -1,20 +1,18 @@
-from pathlib import Path
 from typing import Iterable
 
 import tidalapi
 
-from musync.entity import Artist, Origin, Playlist, Track, User
-from musync.error import IncompatibleEntityError, MissingPrivilegesError
-from musync.session import Session
-
-TIDAL_DIR = Path(__file__).parent.parent.parent.resolve()
+from musync import ROOT_DIR
+from musync.common.entity import Artist, Origin, Playlist, Track, User
+from musync.common.error import IncompatibleEntityError, MissingPrivilegesError
+from musync.common.session import Session
 
 
 class TidalSession(Session):
     _client: tidalapi.Session
 
     def __init__(self) -> None:
-        session_file = TIDAL_DIR / "tidal-session-oauth.json"
+        session_file = ROOT_DIR / "tidal-session-oauth.json"
         self._client = tidalapi.Session()
         self._client.login_session_file(session_file)
 

diff --git a/tests/integrationtests/spotify/test_session.py b/tests/integrationtests/spotify/test_session.py
@@ -3,9 +3,9 @@
 
 import pytest
 
-from musync.entity import Origin, Playlist, Track, User
+from musync.common.entity import Origin, Playlist, Track, User
 from musync.spotify import SpotifySession
-from tests.unittests.entity import DATA_DIR
+from tests.unittests.common.entity import DATA_DIR
 
 
 @pytest.fixture

diff --git a/tests/integrationtests/test_sync_manager.py b/tests/integrationtests/test_sync_manager.py
@@ -1,8 +1,8 @@
 import pytest
 
-from musync.entity import Playlist, Track
+from musync.common import SyncManager
+from musync.common.entity import Playlist, Track
 from musync.spotify import SpotifySession
-from musync.sync_manager import SyncManager
 from musync.tidal import TidalSession
 
 

diff --git a/tests/integrationtests/tidal/test_session.py b/tests/integrationtests/tidal/test_session.py
@@ -3,9 +3,9 @@
 
 import pytest
 
-from musync.entity import Origin, Playlist, Track, User
+from musync.common.entity import Origin, Playlist, Track, User
 from musync.tidal import TidalSession
-from tests.unittests.entity import DATA_DIR
+from tests.unittests.common.entity import DATA_DIR
 
 
 @pytest.fixture

diff --git a/tests/unittests/common/__init__.py b/tests/unittests/common/__init__.py
diff --git a/tests/unittests/entity/__init__.py → tests/unittests/common/entity/__init__.py b/tests/unittests/entity/__init__.py → tests/unittests/common/entity/__init__.py
diff --git a/...tests/entity/data/test_artist_spotify.pkl → ...ommon/entity/data/test_artist_spotify.pkl b/...tests/entity/data/test_artist_spotify.pkl → ...ommon/entity/data/test_artist_spotify.pkl
diff --git a/...ittests/entity/data/test_artist_tidal.pkl → .../common/entity/data/test_artist_tidal.pkl b/...ittests/entity/data/test_artist_tidal.pkl → .../common/entity/data/test_artist_tidal.pkl
diff --git a/...sts/entity/data/test_playlist_spotify.pkl → ...mon/entity/data/test_playlist_spotify.pkl b/...sts/entity/data/test_playlist_spotify.pkl → ...mon/entity/data/test_playlist_spotify.pkl
diff --git a/...tests/entity/data/test_playlist_tidal.pkl → ...ommon/entity/data/test_playlist_tidal.pkl b/...tests/entity/data/test_playlist_tidal.pkl → ...ommon/entity/data/test_playlist_tidal.pkl
diff --git a/...ttests/entity/data/test_track_spotify.pkl → ...common/entity/data/test_track_spotify.pkl b/...ttests/entity/data/test_track_spotify.pkl → ...common/entity/data/test_track_spotify.pkl
diff --git a/...y/data/test_track_spotify_alternative.pkl → ...y/data/test_track_spotify_alternative.pkl b/...y/data/test_track_spotify_alternative.pkl → ...y/data/test_track_spotify_alternative.pkl
diff --git a/...nittests/entity/data/test_track_tidal.pkl → ...s/common/entity/data/test_track_tidal.pkl b/...nittests/entity/data/test_track_tidal.pkl → ...s/common/entity/data/test_track_tidal.pkl
diff --git a/...ittests/entity/data/test_user_spotify.pkl → .../common/entity/data/test_user_spotify.pkl b/...ittests/entity/data/test_user_spotify.pkl → .../common/entity/data/test_user_spotify.pkl
diff --git a/...unittests/entity/data/test_user_tidal.pkl → ...ts/common/entity/data/test_user_tidal.pkl b/...unittests/entity/data/test_user_tidal.pkl → ...ts/common/entity/data/test_user_tidal.pkl
diff --git a/tests/unittests/entity/test_artist.py → tests/unittests/common/entity/test_artist.py b/tests/unittests/entity/test_artist.py → tests/unittests/common/entity/test_artist.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from musync.entity import Artist, Origin
-from tests.unittests.entity import DATA_DIR
+from musync.common.entity import Artist, Origin
+from tests.unittests.common.entity import DATA_DIR
 
 
 @pytest.fixture

diff --git a/tests/unittests/entity/test_playlist.py → .../unittests/common/entity/test_playlist.py b/tests/unittests/entity/test_playlist.py → .../unittests/common/entity/test_playlist.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from musync.entity import Origin, Playlist
-from tests.unittests.entity import DATA_DIR
+from musync.common.entity import Origin, Playlist
+from tests.unittests.common.entity import DATA_DIR
 
 
 @pytest.fixture

diff --git a/tests/unittests/entity/test_track.py → tests/unittests/common/entity/test_track.py b/tests/unittests/entity/test_track.py → tests/unittests/common/entity/test_track.py
@@ -5,8 +5,8 @@
 import pytest
 import pytz
 
-from musync.entity import Origin, Track
-from tests.unittests.entity import DATA_DIR
+from musync.common.entity import Origin, Track
+from tests.unittests.common.entity import DATA_DIR
 
 
 @pytest.fixture(

diff --git a/tests/unittests/entity/test_user.py → tests/unittests/common/entity/test_user.py b/tests/unittests/entity/test_user.py → tests/unittests/common/entity/test_user.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from musync.entity import Origin, User
-from tests.unittests.entity import DATA_DIR
+from musync.common.entity import Origin, User
+from tests.unittests.common.entity import DATA_DIR
 
 
 @pytest.fixture

diff --git a/tests/unittests/test_root_dir.py b/tests/unittests/test_root_dir.py
@@ -0,0 +1,6 @@
+from musync import ROOT_DIR
+
+
+def test_root_dir():
+    musync_dir = ROOT_DIR / "musync"
+    assert musync_dir.exists()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from pathlib import Path

		ROOT_DIR = Path(__file__).parent.parent.resolve()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from .session import Session
		from .sync_manager import SyncManager