From 1a20abe71113b73f2777c108fb8744a51766e074 Mon Sep 17 00:00:00 2001
From: flandre <remilia@flandre.net>
Date: Sun, 11 May 2025 17:50:08 +0800
Subject: [PATCH] add make_uri

---
 flandre/__init__.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/flandre/__init__.py b/flandre/__init__.py
index ce75598..b1aff29 100644
--- a/flandre/__init__.py
+++ b/flandre/__init__.py
@@ -15,7 +15,7 @@ class P:
 
 @dataclasses.dataclass
 class SoftwareConfig:
-    def s(self, host, port, proto='tcp'):
+    def make_uri(self, host, port, proto='tcp'):
         return f'{proto}://{host}:{port}'
 
     data_folder: Path = platformdirs.user_data_path('Flandre', 'Scarlet')
@@ -67,42 +67,42 @@ class SoftwareConfig:
 
     @property
     def live_push_socket(self):
-        return f'tcp://{self.live_ip}:{self.live_push_port}'
+        return self.make_uri(self.live_ip, self.live_push_port)
 
     @property
     def live_rep_socket(self):
-        return f'tcp://{self.live_ip}:{self.live_rep_port}'
+        return self.make_uri(self.live_ip, self.live_rep_port)
 
     @property
     def live_rep_socket_http(self):
-        return f'http://{self.live_ip}:{self.live_rep_port}'
+        return self.make_uri(self.live_ip, self.live_rep_port, proto='http')
 
     @property
     def device_py_rep_socket(self):
-        return f'tcp://{self.live_ip}:{self.device_py_rep_port}'
-
-    playback_port: int = 5003
-
-    @property
-    def playback_socket(self):
-        return f'tcp://127.0.0.1:{self.playback_port}'
+        return self.make_uri(self.live_ip, self.device_py_rep_port)
 
     local_ip: str = '127.0.0.1'
     mi_rep_port: int = 5557
     muxer_rep_port: int = 5560
     driver_rep_port: int = 5561
 
+    playback_port: int = 5003
+
+    @property
+    def playback_socket(self):
+        return self.make_uri(self.local_ip, self.playback_port)
+
     @property
     def mi_rep_socket(self):
-        return self.s(self.local_ip, self.device_py_rep_port)
+        return self.make_uri(self.local_ip, self.device_py_rep_port)
 
     @property
     def muxer_rep_socket(self):
-        return self.s(self.local_ip, self.muxer_rep_port)
+        return self.make_uri(self.local_ip, self.muxer_rep_port)
 
     @property
     def driver_rep_socket(self):
-        return self.s(self.local_ip, self.driver_rep_port)
+        return self.make_uri(self.local_ip, self.driver_rep_port)
 
     switch1_ip: str = 'c1'
     switch1_token: str = '7ad51e0016e7a9d22f753d5110f76c7d'