funkwhale_cli.py

@@ -7,7 +7,7 @@ from src.fw_albums import list_albums
 from src.fw_tracks import list_tracks
 from src.fw_channels import list_channels
 from src.fw_playlists import list_playlists
-from src.fw_recents import list_fav_or_history
+from src.fw_fav_tracks import list_favorites_tracks
 import src.settings as settings
 import src.mpv_control
 import json
@@ -44,7 +44,6 @@ def main():
                 'Channels',
                 'Playlists',
                 'Favorites',
-                'Recently listened',
                 'Search',
                 'Switch instance']
         if not current_instance.s.headers.get('Authorization'):
@@ -69,9 +68,7 @@ def main():
         if selected == 'Playlists':
             list_playlists()
         if selected == 'Favorites':
-            list_fav_or_history()
+            list_favorites_tracks()
-        if selected == 'Recently listened':
-            list_fav_or_history(is_history_view=True)
         if selected == 'Search':
             search_type = fzf.prompt(('Federated', 'All types'))[0]
             if search_type == 'Federated':

src/fw_api.py

@@ -123,7 +123,7 @@ def get_tracks(page=None, q=None, artist=None, album=None, library=None,
 
 @logger.catch
 def get_favorires_tracks(page=None, q=None, scope=None, include_channels=None, pg=None):
-    '''Get favorites tracks (not only for user)'''
+    '''This function get favorites tracks (not only for user)'''
     params = {
         'page': page,
         'q': q,
@@ -138,23 +138,6 @@ def get_favorires_tracks(page=None, q=None, scope=None, include_channels=None, p
     return r.json()
 
 
-@logger.catch
-def get_recently_listened(page=None, q=None, scope=None, include_channels=None, pg=None):
-    '''Get recently listened tracks (not only for user)'''
-    params = {
-        'page': page,
-        'q': q,
-        'scope': scope,
-        'include_channels': include_channels
-    }
-    if pg:
-        r = current_instance.s.get(pg)
-    else:
-        r = current_instance.s.get(
-            f'https://{current_instance.instance}/api/v1/history/listenings', params=params)
-    return r.json()
-
-
 @logger.catch
 def get_artists(page=None, q=None, artist=None, album=None,
                 library=None, favourites=None, refresh=False, pg=None):

src/fw_fav_tracks.py

@@ -1,4 +1,4 @@
-from src.fw_api import get_favorires_tracks, get_recently_listened, get_audio_file
+from src.fw_api import get_favorires_tracks, get_audio_file
 from src.mpv_control import player, player_menu, track_url_to_uuid, player_fw_storage
 from pyfzf.pyfzf import FzfPrompt
 from loguru import logger
@@ -7,13 +7,8 @@ fzf = FzfPrompt()
 
 
 @logger.catch
-def list_fav_or_history(pg=None, search=None, scope=None, is_history_view=False):
+def list_favorites_tracks(pg=None, search=None, scope=None):
-    if is_history_view:
+    tracks = get_favorires_tracks(q=search, scope=scope, pg=pg)
-        caption = 'listened:'
-        tracks = get_recently_listened(q=search, scope=scope, pg=pg)
-    else:
-        caption = 'liked:'
-        tracks = get_favorires_tracks(q=search, scope=scope, pg=pg)
     tracks_next = tracks.get('next')
     tracks_prev = tracks.get('previous')
     tracks_results = tracks.get('results')
@@ -27,15 +22,15 @@ def list_fav_or_history(pg=None, search=None, scope=None, is_history_view=False)
         index = tracks_results.index(i)
         track_name = i['track'].get('title')
         who_user = i['user'].get('username')
-        view.append(f'{index}.{track_name} | {caption} {who_user}')
+        view.append(f'{index}.{track_name} | liked: {who_user}')
     select = fzf.prompt(view, '--multi')
     if 'Next page' in select:
-        list_fav_or_history(pg=tracks_next, is_history_view=is_history_view)
+        list_favorites_tracks(pg=tracks_next)
     elif 'Prev page' in select:
-        list_fav_or_history(pg=tracks_prev, is_history_view=is_history_view)
+        list_favorites_tracks(pg=tracks_prev)
     elif 'Search' in select:
         print('Search by track:')
-        list_fav_or_history(search=input(), is_history_view=is_history_view)
+        list_favorites_tracks(search=input())
     elif 'Limit by scope' in select:
         print('''
 Limit the results to a given user or pod:
@@ -48,7 +43,7 @@ Limit the results to a given user or pod:
 
 ''')
         scope = input()
-        list_fav_or_history(scope=scope, search=search, is_history_view=is_history_view)
+        list_favorites_tracks(scope=scope, search=search)
     elif 'Play this page' in select:
         for i in tracks_results:
             play_track(track=i['track'], multi=True)