Cleanup Makefile, add Caddy

`{err:r}` -> `{err!r}`

Caddyfile

@@ -0,0 +1,6 @@
+http://localhost:4010 {
+	file_server {
+		root ./frontend
+	}
+	reverse_proxy /ws 127.0.0.1:4009
+}

Makefile

@@ -1,4 +1,4 @@
-.PHONY: run test build frontend backend
+.PHONY: run run-backend run-frontend test
 
 run:
 	# See backend/config.py for more fields
@@ -6,15 +6,11 @@ run:
 	COOKIES_DIR=cookies \
 	python3 ./backend/main.py
 
+run-backend: run
+
+run-frontend:
+	@echo 'Only for development environment!'
+	caddy run
+
 test:
-	@python3 -m unittest discover -vcs ./backend
+	python3 -m unittest discover -vcs ./backend
-
-build:
-	make frontend
-	make backend
-
-frontend:
-	@cd frontend && echo 'Not implemented'
-
-backend:
-	@cd backend && echo 'Not implemented'

backend/config.py

@@ -21,7 +21,7 @@ class Config:
         )
 
         # Proxy URL for yt_proxied downloader (can be used for geo-restricted content)
-        self.yt_proxy = os.getenv('YT_PROXY') or 'http://127.0.0.1:1080'
+        self.yt_proxy = os.getenv('YT_PROXY') or None
 
         self.save_lyrics = _parse_bool(os.getenv('SAVE_LYRICS'), True)
         self.save_cover = _parse_bool(os.getenv('SAVE_COVER'), True)

backend/test_pp.py

@@ -69,7 +69,7 @@ class TestPostProcessorsOnFakeData(TestCase):
             if ret != 0:
                 raise RuntimeError(f'FFmpeg returned {ret} exit code')
         except Exception as err:
-            self.skipTest(f'Error while writing empty MP3: {err:r}')
+            self.skipTest(f'Error while writing empty MP3: {err!r}')
 
         id3pp.ID3TagsPP().run(INFO_AFTER)
 

backend/ydl_pool.py

@@ -22,7 +22,9 @@ class _CreateYDL:
     @staticmethod
     def yt_proxied() -> YoutubeDL:
         ydl = _CreateYDL.youtube()
-        ydl.params['proxy'] = config.get().yt_proxy
+        proxy = config.get().yt_proxy
+        if proxy is not None:
+            ydl.params['proxy'] = proxy
         return ydl
 
     @staticmethod

requirements.txt

@@ -1,5 +1,5 @@
 websockets==12.0
-yt-dlp==2024.4.9
+yt-dlp==2024.5.27
 mutagen==1.47.0
 urllib3==2.2.1
-lxml==5.2.1
+lxml==5.2.2