diff --git a/src/actual_donwload.py b/src/actual_donwload.py index 5a0ce7f..35ab53f 100644 --- a/src/actual_donwload.py +++ b/src/actual_donwload.py @@ -1,6 +1,7 @@ import music_kraken from music_kraken import pages -from music_kraken.objects import Song, Target, Source, SourcePages, Album +from music_kraken.utils.enums.source import SourcePages +from music_kraken.objects import Song, Target, Source, Album def search_pages(): diff --git a/src/music_kraken/objects/__init__.py b/src/music_kraken/objects/__init__.py index 9a229db..2f0ad9e 100644 --- a/src/music_kraken/objects/__init__.py +++ b/src/music_kraken/objects/__init__.py @@ -16,8 +16,6 @@ ID3Mapping = metadata.Mapping ID3Timestamp = metadata.ID3Timestamp Source = source.Source -SourceTypes = source.SourceTypes -SourcePages = source.SourcePages Song = song.Song Artist = song.Artist diff --git a/src/music_kraken/pages/abstract.py b/src/music_kraken/pages/abstract.py index 194ccd1..48198a5 100644 --- a/src/music_kraken/pages/abstract.py +++ b/src/music_kraken/pages/abstract.py @@ -16,11 +16,11 @@ from ..objects import ( Target, DatabaseObject, Options, - SourcePages, Collection, Label, AlbumType ) +from ..utils.enums.source import SourcePages from ..audio import write_metadata_to_target, correct_codec from ..utils import shared diff --git a/src/music_kraken/pages/download_center/page_attributes.py b/src/music_kraken/pages/download_center/page_attributes.py index 9989d01..7eb040a 100644 --- a/src/music_kraken/pages/download_center/page_attributes.py +++ b/src/music_kraken/pages/download_center/page_attributes.py @@ -1,6 +1,6 @@ from typing import Tuple, Type, Dict -from ...objects import SourcePages +from ...utils.enums.source import SourcePages from ..abstract import Page from ..encyclopaedia_metallum import EncyclopaediaMetallum from ..musify import Musify diff --git a/src/music_kraken/pages/encyclopaedia_metallum.py b/src/music_kraken/pages/encyclopaedia_metallum.py index 6eaeed1..1ae40ba 100644 --- a/src/music_kraken/pages/encyclopaedia_metallum.py +++ b/src/music_kraken/pages/encyclopaedia_metallum.py @@ -8,11 +8,11 @@ from urllib.parse import urlparse from ..utils.shared import ENCYCLOPAEDIA_METALLUM_LOGGER, proxies from ..utils import string_processing from .abstract import Page +from ..utils.enums.source import SourcePages from ..objects import ( Lyrics, Artist, Source, - SourcePages, Song, Album, ID3Timestamp, diff --git a/src/music_kraken/pages/musify.py b/src/music_kraken/pages/musify.py index 425ec1c..b93f276 100644 --- a/src/music_kraken/pages/musify.py +++ b/src/music_kraken/pages/musify.py @@ -9,10 +9,10 @@ import requests from bs4 import BeautifulSoup from .abstract import Page +from ..utils.enums.source import SourcePages from ..objects import ( Artist, Source, - SourcePages, Song, Album, ID3Timestamp,