src/mpv_control.py

@@ -8,7 +8,6 @@ from shlex import quote
 import mpv
 import time
 import re
-import requests
 
 fzf = FzfPrompt()
 
@@ -24,8 +23,6 @@ player.volume = get_config('mpv_volume')
 player.prefetch_playlist = get_config('prefetch_playlist')
 show_like_button = get_config('show_like_button')
 track_activity_history = get_config('track_activity_history')
-scrobbler_to_fediverse_token = get_config('scrobbler_to_fediverse_token')
-scrobbler_to_fediverse_instance = get_config('scrobbler_to_fediverse_instance')
 shuffle = False
 
 
@@ -47,48 +44,22 @@ def track_url_to_uuid(listen_url=None):
     return uuid[0]
 
 
-if track_activity_history or scrobbler_to_fediverse_token != '':
+if track_activity_history:
     @player.property_observer('time-pos')
     @logger.catch
     def time_observer(_name, value):
         # Here, _value is either None if nothing is playing or a float containing
         # fractional seconds since the beginning of the file.
-        if value:
+        if value and src.fw_api.current_instance.token != None and player.pause is False:
-            if value >= 30.0 and value <= 30.1 and player.pause is False:
+            if value >= 30.0 and value <= 30.1:
                 # detect 30 secs for reporting listen activity
-                try:
+                track = player_fw_storage.storage.get(track_url_to_uuid())
-                    track = player_fw_storage.storage.get(track_url_to_uuid())
+                track_id = track.get('id')
-                except:
+                if track_id:
-                    return
+                    src.fw_api.record_track_in_history(track_id)
-                if src.fw_api.current_instance.token is not None:
+                else:
-                    track_id = track.get('id')
+                    logger.error("Can't write track to history: No track id")
-
-                    if track_id:
-                        if track_activity_history:
-                            src.fw_api.record_track_in_history(track_id)
-                    else:
-                        logger.error("Can't write track to history: No track id")
-                if scrobbler_to_fediverse_token != '':
-                    fid = track.get('fid')
-                    artist = track['artist'].get('name')
-                    album = track['album'].get('title')
-                    title = track.get('title')
-                    tags = track.get('tags')
-                    if tags:
-                        tags = [f'#{tag}' for tag in tags]
-                        tags = ' '.join(tags)
-                    if tags == []:
-                        tags = ''
-                    status_obj = {'spoiler_text': 'funkwhale-cli music scrobbler',
-                                  'visibility': 'unlisted',
-                                  'status': f'🎧 {artist} - {album} - {title}\n{fid}\n#NowPlaying {tags}'}
-                    requests.post(f'https://{scrobbler_to_fediverse_instance}/api/v1/statuses',
-                                  json=status_obj,
-                                  headers={'Authorization': f'Bearer {scrobbler_to_fediverse_token}'})
-                time.sleep(0.100)
-            if value > 30.1:
                 time.sleep(1)
-                return
 
 
 def osd_observer(value):

src/settings.py

@@ -1,5 +1,4 @@
 import json
-import os
 from os.path import exists
 from loguru import logger
 from pyfzf.pyfzf import FzfPrompt
@@ -38,8 +37,6 @@ default_conf = {
     'automatic_fetch_new_instances': False,
     'enable_server_transcoding': False,
     'external_transcoder_http_proxy_path': "",
-    'scrobbler_to_fediverse_token': "",
-    'scrobbler_to_fediverse_instance': "",
     'track_activity_history': False,
     'prefetch_playlist': True,
     'enable_persistent_cache': False,
@@ -53,15 +50,7 @@ def set_defaults(corrected_config=None):
     conf_rewrite = default_conf
     if corrected_config:
         conf_rewrite = corrected_config
-    descriptor = os.open(
+    with open(conf_file, 'wt') as f:
-        path=conf_file,
-        flags=(
-            os.O_WRONLY  # access mode: write only
-            | os.O_CREAT  # create if not exists
-            | os.O_TRUNC  # truncate the file to zero
-        ),
-        mode=0o600)
-    with open(descriptor, 'wt') as f:
         f.write(json.dumps(conf_rewrite, indent=4))