music-kraken/music-kraken-core
3
2
Fork 0
Code Issues 11 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

finished implementing general search

Browse Source
This commit is contained in:
Hellow
2023-07-28 09:07:16 +02:00
parent a5b76648f5
commit 406dc3d1e2
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/music_kraken/pages/youtube_music/_music_object_render.py
View File

@@ -1,7 +1,7 @@
from typing import List, Optional
from enum import Enum
from ...utils.shared import YOUTUBE_MUSIC_LOGGER as LOGGER
from ...utils.shared import YOUTUBE_MUSIC_LOGGER as LOGGER, YOUTUBE_MUSIC_CLEAN_DATA
from ...objects import Source, DatabaseObject
from ..abstract import Page
from ...objects import (
@@ -23,7 +23,8 @@ class PageType(Enum):
ALBUM = "MUSIC_PAGE_TYPE_ALBUM"
CHANNEL = "MUSIC_PAGE_TYPE_USER_CHANNEL"
PLAYLIST = "MUSIC_PAGE_TYPE_PLAYLIST"
SONG = "song"
SONG = "MUSIC_VIDEO_TYPE_ATV"
VIDEO = "MUSIC_VIDEO_TYPE_UGC"
def parse_run_element(run_element: dict) -> Optional[DatabaseObject]:
@@ -36,9 +37,10 @@ def parse_run_element(run_element: dict) -> Optional[DatabaseObject]:
navigation_endpoint = _temp_nav.get("watchEndpoint" if is_video else "browseEndpoint", {})
element_type = PageType.SONG
page_type_string = navigation_endpoint.get("watchEndpointMusicSupportedConfigs", {}).get("watchEndpointMusicConfig", {}).get("musicVideoType", "")
if not is_video:
page_type_string = navigation_endpoint.get("browseEndpointContextSupportedConfigs", {}).get("browseEndpointContextMusicConfig", {}).get("pageType", "")
element_type = PageType(page_type_string)
element_type = PageType(page_type_string)
element_id = navigation_endpoint.get("videoId" if is_video else "browseId")
element_text = run_element.get("text")
@@ -47,19 +49,19 @@ def parse_run_element(run_element: dict) -> Optional[DatabaseObject]:
LOGGER.warning("Couldn't find either the id or text of a Youtube music element.")
return
if is_video:
if element_type == PageType.SONG or (element_type == PageType.VIDEO and not YOUTUBE_MUSIC_CLEAN_DATA):
source = Source(SOURCE_PAGE, f"https://music.youtube.com/watch?v={element_id}")
return Song(title=element_text, source_list=[source])
if element_type == PageType.ARTIST or element_type == PageType.CHANNEL:
if element_type == PageType.ARTIST or (element_type == PageType.CHANNEL and not YOUTUBE_MUSIC_CLEAN_DATA):
source = Source(SOURCE_PAGE, f"https://music.youtube.com/channel/{element_id}")
return Artist(name=element_text, source_list=[source])
if element_type == PageType.ALBUM or element_type == PageType.PLAYLIST:
if element_type == PageType.ALBUM or (element_type == PageType.PLAYLIST and not YOUTUBE_MUSIC_CLEAN_DATA):
source = Source(SOURCE_PAGE, f"https://music.youtube.com/playlist?list={element_id}")
return Album(title=element_text, source_list=[source])
LOGGER.warning(f"Type {page_type_string} wasn't implemented.")
LOGGER.debug(f"Type {page_type_string} wasn't implemented.")
def parse_run_list(run_list: List[dict]) -> List[DatabaseObject]:

8
src/music_kraken/pages/youtube_music/youtube_music.py
View File

@@ -274,11 +274,17 @@ class YoutubeMusic(Page):
cant use fixed indices, because if something has no entries, the list dissappears
instead I have to try parse everything, and just reject community playlists and profiles.
"""
for renderer in renderer_list:
results.extend(parse_renderer(renderer))
"""
results.extend(parse_renderer(renderer_list[1]))
results.extend(parse_renderer(renderer_list[2]))
results.extend(parse_renderer(renderer_list[4]))
results.extend(parse_renderer(renderer_list[6]))
"""
return results
def label_search(self, label: Label) -> List[Label]: