Code refactoring

Using normalization and major classes (forgot :) )

yandex_music/__init__.py

@@ -1,28 +1,14 @@
 from .base import YandexMusicObject
+
 from .invocation_info import InvocationInfo
 from .settings import Settings
 from .permission_alerts import PermissionAlerts
 from .experiments import Experiments
-from .artist import Artist
-from .album import Album
-from .playlist import Playlist
-from .track import Track
 from .cover import Cover
-from .ratings import Ratings
-from .counts import Counts
-from .link import Link
-from .user import User
-from .case_forms import CaseForms
-from .made_for import MadeFor
-from .label import Label
-from .play_counter import PlayCounter
 from .track_short import TrackShort
-from .major import Major
-from .normalization import Normalization
-from .track_position import TrackPosition
 from .promo_code_status import PromoCodeStatus
 from .download_info import DownloadInfo
-from .video import Video
+from .icon import Icon
 
 from status.account import Account
 from status.plus import Plus
@@ -34,6 +20,25 @@ from status.passport_phone import PassportPhone
 from status.permissions import Permissions
 from status.status import Status
 
+from track.major import Major
+from track.normalization import Normalization
+from track.track import Track
+
+from playlist.case_forms import CaseForms
+from playlist.made_for import MadeFor
+from playlist.user import User
+from playlist.play_counter import PlayCounter
+from playlist.playlist import Playlist
+
+from artist.link import Link
+from artist.counts import Counts
+from artist.ratings import Ratings
+from artist.artist import Artist
+
+from album.label import Label
+from album.track_position import TrackPosition
+from album.album import Album
+
 from feed.generated_playlist import GeneratedPlaylist
 from feed.album_event import AlbumEvent
 from feed.artist_event import ArtistEvent
@@ -47,6 +52,7 @@ from likes.artists_likes import ArtistsLikes
 from likes.playlists_likes import PlaylistsLikes
 from likes.tracks_likes import TracksLikes
 
+from search.video import Video
 from search.best import Best
 from search.search import Search
 from search.suggestions import Suggestions
@@ -71,7 +77,6 @@ from landing.play_contexts_data import PlayContextsData
 from landing.personal_playlists_data import PersonalPlaylistsData
 
 from genre.title import Title
-from genre.radio_icon import RadioIcon
 from genre.images import Images
 from genre.genre import Genre
 
@@ -84,4 +89,4 @@ __all__ = ['YandexMusicObject', 'Account', 'PassportPhone', 'InvocationInfo', 'P
            'ArtistSearchResult', 'PlaylistSearchResult', 'TrackSearchResult', 'VideoSearchResult', 'Search',
            'Suggestions', 'MixLink', 'BlockEntity', 'Block', 'PlayContextsData', 'TrackId', 'TrackShortOld',
            'PersonalPlaylistsData', 'Promotion', 'Landing', 'Chart', 'ChartItem', 'PlayContext', 'Title', 'Genre',
-           'RadioIcon', 'Images']
+           'Icon', 'Images']

yandex_music/genre/genre.py

@@ -42,10 +42,10 @@ class Genre(YandexMusicObject):
             return None
 
         data = super(Genre, cls).de_json(data, client)
-        from yandex_music import Title, RadioIcon, Images
+        from yandex_music import Title, Icon, Images
         data['titles'] = Title.de_dict(data.get('titles'), client)
         data['images'] = Images.de_json(data.get('images'), client)
-        data['radio_icon'] = RadioIcon.de_json(data.get('radio_icon'), client)
+        data['radio_icon'] = Icon.de_json(data.get('radio_icon'), client)
         data['sub_genres'] = Genre.de_list(data.get('sub_genres'), client)
 
         return cls(client=client, **data)

yandex_music/icon.py

@@ -1,7 +1,7 @@
 from yandex_music import YandexMusicObject
 
 
-class RadioIcon(YandexMusicObject):
+class Icon(YandexMusicObject):
     def __init__(self,
                  background_color,
                  image_url,
@@ -17,6 +17,6 @@ class RadioIcon(YandexMusicObject):
         if not data:
             return None
 
-        data = super(RadioIcon, cls).de_json(data, client)
+        data = super(Icon, cls).de_json(data, client)
 
         return cls(client=client, **data)

yandex_music/track/track.py

@@ -80,6 +80,9 @@ class Track(YandexMusicObject):
             return None
 
         data = super(Track, cls).de_json(data, client)
+        from yandex_music import Normalization, Major
+        data['normalization'] = Normalization.de_json(data.get('normalization'), client)
+        data['major'] = Major.de_json(data.get('major'), client)
 
         return cls(client=client, **data)