Type annotation, linter fixes and cleanup

grzegorz_clients/__main__.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-import os, sys, shutil
 from remi import start
 from threading import Timer
 import typer

grzegorz_clients/api.py

@@ -1,7 +1,6 @@
 import requests, json
 from urllib.parse import urlencode
 from functools import wraps
-from . import api
 
 # This must be set to be able to use it on remote hosts
 BASE_URL = "http://localhost:8080/api"
@@ -58,7 +57,7 @@ def load_path(path:str, data:dict=None):
 
 @request_get
 def is_playing():
-    return f"play"
+    return "play"
 
 @request_post
 def set_playing(play: bool):
@@ -67,7 +66,7 @@ def set_playing(play:bool):
 
 @request_get
 def get_volume():
-    return f"volume"
+    return "volume"
 
 @request_post
 def set_volume(volume: int): # between 0 and 100 (you may also exceed 100)
@@ -76,11 +75,11 @@ def set_volume(volume:int):# between 0 and 100 (you may also exceed 100)
 
 @request_get
 def get_playlist():
-    return f"playlist"
+    return "playlist"
 
 @request_post
 def playlist_next():
-    return f"playlist/next", None
+    return "playlist/next", None
 
 @request_post
 def playlist_goto(index: int):
@@ -89,15 +88,15 @@ def playlist_goto(index:int):
 
 @request_post
 def playlist_previous():
-    return f"playlist/previous", None
+    return "playlist/previous", None
 
 @request_post
 def playlist_shuffle():
-    return f"playlist/shuffle", None
+    return "playlist/shuffle", None
 
 @request_delete
 def playlist_clear():
-    return f"playlist", None
+    return "playlist", None
 
 @request_delete
 def playlist_remove(index: int):
@@ -111,7 +110,7 @@ def playlist_move(index1:int, index2:int):
 
 @request_get
 def get_playlist_looping():
-    return f"playlist/loop"
+    return "playlist/loop"
 
 @request_post
 def playlist_set_looping(looping: bool):
@@ -120,7 +119,7 @@ def playlist_set_looping(looping:bool):
 
 @request_get
 def get_playback_pos():
-    return f"time"
+    return "time"
 
 @request_post
 def seek_absolute(pos: float):

grzegorz_clients/remi_ui.py

@@ -2,7 +2,8 @@ import os
 from threading import Timer
 import remi.gui as gui
 from remi import App
-from .utils import Namespace, call_as_thread, seconds_to_timestamp
+from argparse import Namespace
+from .utils import call_as_thread, seconds_to_timestamp
 from . import api
 from .constants import colors, icons
 
@@ -71,7 +72,7 @@ class RemiApp(App):
 
 	def make_gui_container(self):#placement and styling
 		# Logo image:
-		self.logo_image.style["width"] = f"100%"
+		self.logo_image.style["width"] = "100%"
 		for i in (self.playback.previous, self.playback.play, self.playback.next, self.playback.party):
 			i.style["margin"] = "3px"
 			i.style["width"]  = "2.8em"

grzegorz_clients/utils.py

@@ -1,9 +1,5 @@
 from functools import wraps
-from urllib.parse import urlsplit, urlunsplit, parse_qs, urlencode
 import threading
-import youtube_dl
-
-class Namespace(object): pass
 
 def seconds_to_timestamp(s):
 	return "%i:%.2i" % (s//60, s%60)