Compare commits

...

4 commits

8 changed files with 18 additions and 27 deletions

View file

@ -1,6 +1,5 @@
# Avalaible mirrors # Avalaible mirrors
https://inex.dev/localhost_frssoft/funkwhale-cli.git https://inex.dev/localhost_frssoft/funkwlmpv.git
|- https://git.vector1.dev/localhost_frssoft/funkwhale-cli |- https://git.vector1.dev/localhost_frssoft/funkwlmpv
https://git.macaw.me/localhost_frssoft/funkwhale-cli.git https://git.macaw.me/localhost_frssoft/funkwlmpv.git
https://code.criminallycute.fi/localhost_frssoft/funkwhale-cli.git https://code.criminallycute.fi/localhost_frssoft/funkwlmpv.git
https://git.poridge.club/localhost_frssoft/funkwhale-cli.git

View file

@ -1,4 +1,4 @@
# funkwhale-cli # funkwlmpv
Just for fun. A simple TUI media player for FunkWhale instances. Writen on python Just for fun. A simple TUI media player for FunkWhale instances. Writen on python
Features: Features:
@ -21,7 +21,7 @@ Python dependencies:
Optional: brotli Optional: brotli
### About cache folder ### About cache folder
funkwhale-cli has to cache tracks before playing (default disabled "enable_persistent_cache"). Cache is persistent and you should manage it manually because the (script/program) can't clean it automatically. funkwlmpv has to cache tracks before playing (default disabled "enable_persistent_cache"). Cache is persistent and you should manage it manually because the (script/program) can't clean it automatically.
Cache structure: cache/domain.tld/[track uuid] Cache structure: cache/domain.tld/[track uuid]
You can play tracks offline, example: mpv --shuffle cache/*/* You can play tracks offline, example: mpv --shuffle cache/*/*
cache_helper.sh - it might be useful for compression cache (lossy: vorbis 128 kbps, no thumbnail) cache_helper.sh - it might be useful for compression cache (lossy: vorbis 128 kbps, no thumbnail)

View file

@ -94,7 +94,7 @@ def main():
print(f''' print(f'''
If You want sign in, please visit: If You want sign in, please visit:
https://{current_instance.instance}/settings/applications/new https://{current_instance.instance}/settings/applications/new
And fill Name funkwhale-cli And fill Name funkwlmpv
Scopes: Scopes:
Read | Write (optional): Read | Write (optional):
write:libraries write:libraries

View file

@ -32,7 +32,7 @@ class current_instance:
s = requests.Session() s = requests.Session()
s.headers.update({ s.headers.update({
"Accept-encoding": 'gzip, br, deflate', "Accept-encoding": 'gzip, br, deflate',
"User-Agent": "funkwhale-cli/latest-commit; +https://git.phreedom.club/localhost_frssoft/funkwhale-cli" "User-Agent": "funkwlmpv/latest-commit; +https://git.phreedom.club/localhost_frssoft/funkwlmpv"
}) })
instance = get_config('instance') instance = get_config('instance')
token = auth.get(instance) token = auth.get(instance)

View file

@ -77,7 +77,7 @@ def fetch_instances_nodeinfo_and_avalaibility(instances):
return requests.get('https://' + instance + '/api/v1/instance/nodeinfo/2.0/', return requests.get('https://' + instance + '/api/v1/instance/nodeinfo/2.0/',
headers={ headers={
'Accept-Encoding': 'gzip, brotli, deflate', 'Accept-Encoding': 'gzip, brotli, deflate',
'User-Agent': 'funkwhale-cli/latest-commit; +https://git.phreedom.club/localhost_frssoft/funkwhale-cli'}, 'User-Agent': 'funkwlmpv/latest-commit; +https://git.phreedom.club/localhost_frssoft/funkwlmpv'},
timeout=10).json() timeout=10).json()
with concurrent.futures.ThreadPoolExecutor() as executor: # optimally defined number of threads with concurrent.futures.ThreadPoolExecutor() as executor: # optimally defined number of threads

View file

@ -1,6 +1,6 @@
from src.fw_api import get_favorires_tracks, get_recently_listened, get_audio_file from src.fw_api import get_favorires_tracks, get_recently_listened, get_audio_file
from src.fw_api_hints import hint_scope from src.fw_api_hints import hint_scope
from src.mpv_control import player, player_menu, track_url_to_uuid, player_fw_storage from src.mpv_control import player, player_menu, track_url_to_uuid, player_fw_storage, play_track
from pyfzf.pyfzf import FzfPrompt from pyfzf.pyfzf import FzfPrompt
from loguru import logger from loguru import logger
@ -54,14 +54,3 @@ def list_fav_or_history(pg=None, search=None, scope=None, is_history_view=False)
else: else:
play_track(track=tracks_results[int( play_track(track=tracks_results[int(
select[0].split('.', 1)[0])]['track']) select[0].split('.', 1)[0])]['track'])
def play_track(track, multi=False):
listen_url = get_audio_file(track['listen_url'], True)
player_fw_storage.storage[track_url_to_uuid(listen_url)] = track
if multi:
player.loadfile(listen_url, 'append-play')
else:
player.loadfile(listen_url, 'append-play')
track_name = track.get('title')
player_menu(f"{track_name} playing...", player_fw_storage.storage)

View file

@ -49,10 +49,13 @@ def list_tracks(pg=None, search=None, tag=None, library=None):
for i in tracks_results: for i in tracks_results:
play_track(track=i, multi=True) play_track(track=i, multi=True)
elif select == 'Play all pages': elif select == 'Play all pages':
if tracks_count > 1000: if tracks_count > 500:
yn = input('WARNING: you really want add more than 1000 tracks? (y/[n])\n').lower() yn = input('WARNING: you really want add more than 500 tracks? (y/[n] or number of tracks)\n').lower()
if yn != 'y': try:
return tracks_count = int(yn)
except:
if yn != 'y':
return
count_loaded = 0 count_loaded = 0
while tracks_count > count_loaded: while tracks_count > count_loaded:
for i in tracks_results: for i in tracks_results:

View file

@ -69,7 +69,7 @@ def send_listen_activity():
tags = ' '.join(tags) tags = ' '.join(tags)
if tags == []: if tags == []:
tags = '' tags = ''
status_obj = {'spoiler_text': 'funkwhale-cli music share', status_obj = {'spoiler_text': 'funkwlmpv music share',
'visibility': 'unlisted', 'visibility': 'unlisted',
'status': f'🎧 {artist} - {album} - {title}\n{fid}\n#NowPlaying {tags}'} 'status': f'🎧 {artist} - {album} - {title}\n{fid}\n#NowPlaying {tags}'}
requests.post(f'https://{share_to_fediverse_instance}/api/v1/statuses', requests.post(f'https://{share_to_fediverse_instance}/api/v1/statuses',