Compare commits

..

No commits in common. "81f818bc2f4574f75a7f8767304c51ea83a40d31" and "c56b68bb0cc9121f2a346b4ef77ec19920e88129" have entirely different histories.

3 changed files with 5 additions and 10 deletions

View File

@ -170,7 +170,7 @@ def get_recently_listened(page=None, q=None, scope=None, include_channels=None,
@logger.catch @logger.catch
def get_artists(page=None, q=None, artist=None, album=None, tag=None, def get_artists(page=None, q=None, artist=None, album=None,
library=None, scope=None, favourites=None, refresh=False, pg=None): library=None, scope=None, favourites=None, refresh=False, pg=None):
'''This function get artists by params''' '''This function get artists by params'''
params = { params = {
@ -178,7 +178,6 @@ def get_artists(page=None, q=None, artist=None, album=None, tag=None,
'q': q, 'q': q,
'artist': artist, 'artist': artist,
'album': album, 'album': album,
'tag': tag,
'library': library, 'library': library,
'scope': scope, 'scope': scope,
'favourites': favourites, 'favourites': favourites,

View File

@ -2,7 +2,6 @@ from src.fw_api import get_artists, get_tracks, get_audio_file
from src.fw_api_hints import hint_scope from src.fw_api_hints import hint_scope
from src.fw_albums import list_albums from src.fw_albums import list_albums
from src.fw_libraries import libraries from src.fw_libraries import libraries
from src.fw_tags import list_tags
from src.mpv_control import player, player_menu, track_url_to_uuid from src.mpv_control import player, player_menu, track_url_to_uuid
from pyfzf.pyfzf import FzfPrompt from pyfzf.pyfzf import FzfPrompt
from loguru import logger from loguru import logger
@ -11,12 +10,12 @@ fzf = FzfPrompt()
@logger.catch @logger.catch
def list_artists(pg=None, search=None, library=None, scope=None, tag=None): def list_artists(pg=None, search=None, library=None, scope=None):
artists = get_artists(q=search, library=library, pg=pg, scope=scope, tag=tag) artists = get_artists(q=search, library=library, pg=pg, scope=scope)
artists_next = artists.get('next') artists_next = artists.get('next')
artists_prev = artists.get('previous') artists_prev = artists.get('previous')
artists_results = artists.get('results') artists_results = artists.get('results')
view = ['Search', 'Tag', 'Library', 'Limit by scope'] view = ['Search', 'Library', 'Limit by scope']
if artists_next: if artists_next:
view.append('Next page') view.append('Next page')
if artists_prev: if artists_prev:
@ -40,8 +39,6 @@ def list_artists(pg=None, search=None, library=None, scope=None, tag=None):
elif select == 'Search': elif select == 'Search':
print('Search by artist:') print('Search by artist:')
list_artists(search=input()) list_artists(search=input())
elif select == 'Tag':
list_artists(tag=list_tags())
elif select == 'Library': elif select == 'Library':
select_lib = libraries() select_lib = libraries()
list_artists(library=select_lib) list_artists(library=select_lib)

View File

@ -25,9 +25,8 @@ def libraries(pg=None, radio=False):
index = libs.index(lib_i) index = libs.index(lib_i)
lib_name = lib_i.get('name') lib_name = lib_i.get('name')
lib_tracks_count = lib_i.get('uploads_count') lib_tracks_count = lib_i.get('uploads_count')
lib_access = lib_i.get('privacy_level')
lib_by = lib_i.get('actor').get('full_username') lib_by = lib_i.get('actor').get('full_username')
libraries_listing.append(f'{index}.{lib_name} | {lib_by} | {lib_tracks_count} | {lib_access}') libraries_listing.append(f'{index}.{lib_name} | {lib_by} | {lib_tracks_count}')
lib_select = fzf.prompt( lib_select = fzf.prompt(
libraries_listing, libraries_listing,
f'--header=\'found {libs_count} libraries\nmap: library name | owner | tracks count\'') f'--header=\'found {libs_count} libraries\nmap: library name | owner | tracks count\'')