diff --git a/src/music_kraken/objects/__init__.py b/src/music_kraken/objects/__init__.py index 2f0ad9e..374d871 100644 --- a/src/music_kraken/objects/__init__.py +++ b/src/music_kraken/objects/__init__.py @@ -1,10 +1,10 @@ +from ..utils.enums import album from . import ( song, metadata, source, parents, formatted_text, - album, option, collection ) @@ -24,8 +24,6 @@ Target = song.Target Lyrics = song.Lyrics Label = song.Label -AlbumType = album.AlbumType -AlbumStatus = album.AlbumStatus Album = song.Album FormattedText = formatted_text.FormattedText diff --git a/src/music_kraken/objects/song.py b/src/music_kraken/objects/song.py index 1b58109..56a11e8 100644 --- a/src/music_kraken/objects/song.py +++ b/src/music_kraken/objects/song.py @@ -4,7 +4,7 @@ from typing import List, Optional, Dict, Tuple import pycountry -from .album import AlbumType, AlbumStatus +from ..utils.enums.album import AlbumType, AlbumStatus from .collection import Collection from .formatted_text import FormattedText from .lyrics import Lyrics diff --git a/src/music_kraken/pages/abstract.py b/src/music_kraken/pages/abstract.py index 48198a5..e049b1f 100644 --- a/src/music_kraken/pages/abstract.py +++ b/src/music_kraken/pages/abstract.py @@ -18,9 +18,9 @@ from ..objects import ( Options, Collection, Label, - AlbumType ) from ..utils.enums.source import SourcePages +from ..utils.enums.album import AlbumType from ..audio import write_metadata_to_target, correct_codec from ..utils import shared diff --git a/src/music_kraken/pages/encyclopaedia_metallum.py b/src/music_kraken/pages/encyclopaedia_metallum.py index 1ae40ba..1bd90b8 100644 --- a/src/music_kraken/pages/encyclopaedia_metallum.py +++ b/src/music_kraken/pages/encyclopaedia_metallum.py @@ -9,6 +9,7 @@ from ..utils.shared import ENCYCLOPAEDIA_METALLUM_LOGGER, proxies from ..utils import string_processing from .abstract import Page from ..utils.enums.source import SourcePages +from ..utils.enums.album import AlbumType from ..objects import ( Lyrics, Artist, @@ -19,7 +20,6 @@ from ..objects import ( FormattedText, Label, Options, - AlbumType ) diff --git a/src/music_kraken/pages/musify.py b/src/music_kraken/pages/musify.py index b93f276..3dab3a9 100644 --- a/src/music_kraken/pages/musify.py +++ b/src/music_kraken/pages/musify.py @@ -10,6 +10,7 @@ from bs4 import BeautifulSoup from .abstract import Page from ..utils.enums.source import SourcePages +from ..utils.enums.album import AlbumType, AlbumStatus from ..objects import ( Artist, Source, @@ -19,8 +20,6 @@ from ..objects import ( FormattedText, Label, Options, - AlbumType, - AlbumStatus, Target ) from ..utils import string_processing, shared diff --git a/src/music_kraken/objects/album.py b/src/music_kraken/utils/enums/album.py similarity index 100% rename from src/music_kraken/objects/album.py rename to src/music_kraken/utils/enums/album.py