spothomelight 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

spothomelight/auth.py

@@ -44,4 +44,4 @@ def get_spotify_client(config):
             print(f"登录失败: {e}")
             return None
 
-    return spotipy.Spotify(auth=token_info['access_token'], oauth_manager=sp_oauth)
+    return spotipy.Spotify(oauth_manager=sp_oauth)

spothomelight/core.py

@@ -16,13 +16,13 @@ def run_loop(config):
     interval = int(config['GENERAL']['interval'])
     
     if not webhook_id:
-        print("错误: 配置文件中 webhook_id 为空，无法发送数据。")
+        print("Error: webhook_id is empty.")
         return
 
     webhook_full_url = f"{ha_url}/api/webhook/{webhook_id}"
     
-    print(f"服务已启动。监控频率: {interval}秒")
-    print(f"Home Assistant 地址: {webhook_full_url}")
+    print(f"Service started. interval: {interval}")
+    print(f"Home Assistant: {webhook_full_url}")
 
     last_track_id = None
     last_is_playing = False
@@ -40,7 +40,7 @@ def run_loop(config):
                 track_id = item['id']
                 
                 if track_id != last_track_id or not last_is_playing:
-                    print(f"检测到正在播放: {item['name']} - {item['artists'][0]['name']}")
+                    print(f"Now playing: {item['name']} - {item['artists'][0]['name']}")
                     
                     images = item['album']['images']
                     image_url = images[0]['url'] if images else None
@@ -59,9 +59,9 @@ def run_loop(config):
                             
                             try:
                                 requests.post(webhook_full_url, json=payload, timeout=5)
-                                print(f"已发送颜色 {payload['hex']} 到 HA")
+                                print(f"Push {payload['hex']} to HA")
                             except Exception as e:
-                                print(f"发送 Webhook 失败: {e}")
+                                print(f"Webhook Error: {e}")
                     
                     last_track_id = track_id
                 
@@ -69,7 +69,7 @@ def run_loop(config):
             
             else:
                 if last_is_playing:
-                    print("播放已暂停/停止")
+                    print("stop/pause playing")
                     # try:
                     #     requests.post(webhook_full_url, json={"state": "paused"}, timeout=5)
                     # except:
@@ -77,7 +77,7 @@ def run_loop(config):
                 last_is_playing = False
 
         except Exception as e:
-            print(f"运行循环发生错误: {e}")
+            print(f"Error: {e}")
             time.sleep(10)
 
         time.sleep(interval)

spothomelight/main.py

@@ -1,7 +1,7 @@
 import argparse
 import sys
 from .config import load_config, open_config_editor
-from .service import setup_autostart
+from .service import setup_autostart, start_managed_service
 from .utils import check_running, stop_process
 from .core import run_loop
 
@@ -14,9 +14,12 @@ def main():
         """
     )
     
-    parser.add_argument("-c", "--config", action="store_true", help="打开配置文件")
-    parser.add_argument("-a", "--autostart", action="store_true", help="配置开机自动运行")
-    parser.add_argument("-s", "--stop", action="store_true", help="停止正在运行的服务")
+    config_group = parser.add_argument_group('配置选项')
+    config_group.add_argument("-c", "--config", action="store_true", help="打开配置文件")
+    service_group = parser.add_argument_group('服务管理')
+    service_group.add_argument("-a", "--autostart", action="store_true", help="配置开机自动运行")
+    service_group.add_argument("--start", action="store_true", help="启动已配置的后台服务")
+    service_group.add_argument("-s", "--stop", action="store_true", help="停止正在运行的服务")
     
     args = parser.parse_args()
 
@@ -32,9 +35,18 @@ def main():
         setup_autostart()
         sys.exit(0)
 
+    if args.start:
+        pid = check_running()
+        if pid:
+            print(f"提示: 服务已经在运行中 (PID: {pid})，无需重复启动。")
+        else:
+            start_managed_service()
+        sys.exit(0)
+
     pid = check_running()
     if pid:
-        print(f"错误: 服务已在运行中 (PID: {pid})。请先停止或直接使用。")
+        print(f"错误: 服务已在后台运行中 (PID: {pid})。")
+        print("如果要查看实时日志或调试，请先停止服务: spothomelight -s")
         sys.exit(1)
 
     config = load_config()

spothomelight/service.py

@@ -85,4 +85,40 @@ WantedBy=default.target
             print(f"已创建 Windows 计划任务: {task_name}")
             print("下次登录时将自动运行。")
         except subprocess.CalledProcessError as e:
-            print(f"创建计划任务失败: {e}")
+            print(f"创建计划任务失败: {e}")
+
+def start_managed_service():
+    system = platform.system()
+
+    if system == "Linux":
+        is_root = (os.geteuid() == 0)
+
+        if is_root:
+            print("正在启动系统级后台服务...")
+            ret = os.system("systemctl start spothomelight")
+            if ret == 0:
+                print("服务已启动。请使用 'systemctl status spothomelight' 查看详情。")
+            else:
+                print("启动失败。请检查服务是否已安装 (spothomelight -a)。")
+        else:
+            print("正在启动用户级后台服务...")
+            ret = os.system("systemctl --user start spothomelight")
+            if ret == 0:
+                print("服务已启动。请使用 'systemctl --user status spothomelight' 查看详情。")
+            else:
+                print("启动失败。请检查服务是否已安装 (spothomelight -a)，或尝试手动运行 'systemctl --user start spothomelight'。")
+
+    elif system == "Windows":
+        task_name = "SpotHomeLightAutoStart"
+        print(f"正在启动 Windows 计划任务: {task_name} ...")
+        cmd = ["schtasks", "/Run", "/TN", task_name]
+        
+        try:
+            result = subprocess.run(cmd, check=True, capture_output=True, text=True)
+            print("服务已启动。")
+        except subprocess.CalledProcessError as e:
+            err_msg = e.stderr.strip() if e.stderr else str(e)
+            if "系统找不到指定的文件" in err_msg or "does not exist" in err_msg:
+                print("错误: 未找到计划任务。请先运行 'spothomelight -a' 进行配置。")
+            else:
+                print(f"启动失败: {err_msg}")

spothomelight/utils.py

@@ -30,7 +30,7 @@ def get_image_color(image_url):
             return (rgb.r, rgb.g, rgb.b)
 
     except Exception as e:
-        print(f"取色失败: {e}")
+        print(f"get_image_color Error: {e}")
         return None
 
 def write_pid():

{spothomelight-1.0.2.dist-info → spothomelight-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spothomelight
-Version: 1.0.2
+Version: 1.0.4
 Summary: Sync Spotify cover color to Home Assistant via Webhook
 Author-email: "ZGQ Inc." <zgqinc@gmail.com>
 Project-URL: Homepage, https://github.com/ZGQ-inc/SpotHomeLight
@@ -28,7 +28,7 @@ Dynamic: license-file
 * **跨平台支持**：完美支持 Linux (Systemd) 和 Windows (计划任务)。
 * **无头模式设计**：专为无显示器的家用服务器设计，支持终端内完成 OAuth 认证。
 * **智能取色**：使用 K-Means 聚类算法提取最主要颜色，并进行缩略图预处理以降低 CPU 占用。
-* **开机自启**：内置一键配置开机自动运行 (`-a`)。
+* **开机自启**：内置一键配置开机自动运行。
 * **低资源占用**：去重机制，仅在切歌时进行下载和计算。
 
 ## 🛠️ 前置要求
@@ -97,7 +97,7 @@ mode: restart
 trigger:
   - platform: webhook
     webhook_id: ""
-    local_only: true
+    local_only: false
 condition: []
 action:
   - service: light.turn_on
@@ -138,10 +138,16 @@ spothomelight -a
 * **Linux**: 会自动创建并启用 Systemd User Service。
 * **Windows**: 会自动创建 Windows 计划任务（登录时运行）。
 
+手动启动服务：
+
+```bash
+spothomelight --start
+```
+
 停止服务：
 
 ```bash
-spothomelight -s
+spothomelight --stop
 ```
 
 ## 🐛 已知问题

spothomelight-1.0.4.dist-info/RECORD

@@ -0,0 +1,14 @@
+spothomelight/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spothomelight/auth.py,sha256=xWmHqmhA3cLgVLzDyOvvS1AdanwG4_zkZQYuYnTvf5M,1673
+spothomelight/config.py,sha256=URC1WwzZN2gRIfwNlMRwHNVtoviayYzmf6F0w3lMhLA,2274
+spothomelight/core.py,sha256=Il7iuX2tKmJlqVUSUVLM_H7UvneufwAnWq6YpYRKRik,2896
+spothomelight/main.py,sha256=N-o-Wh4VhTDRX45mgxZMobSNNfOv5qnuY4wsu4JV78k,1954
+spothomelight/service.py,sha256=nB77JRqNoOFchWT5k_Tmpln--aT69Bu1DWQ8yNgzdlo,4654
+spothomelight/utils.py,sha256=VdJEms2mNMI7-8QYNnH-g4irnZh1pcQiFg_nwefxXss,1823
+spothomelight/utils_median_cut.py,sha256=9sqUBk0ZpHWwfoPl4YPRcljE_K05w8trZFQo8bVCMds,1991
+spothomelight-1.0.4.dist-info/licenses/LICENSE,sha256=_r815CZLcqdQJmXH7FeFNoBT8gmiGtsdqo4aynUS-DM,1065
+spothomelight-1.0.4.dist-info/METADATA,sha256=UaDF7gn9g-4g0jgbenIW1ATt-tW4f4n_OhOL4715L9A,4601
+spothomelight-1.0.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+spothomelight-1.0.4.dist-info/entry_points.txt,sha256=f9haGAoi-aXDTCkoxuSkdN78sHbvfbrr9gwaOIewuvw,58
+spothomelight-1.0.4.dist-info/top_level.txt,sha256=70ecLHIP1BNR5ZLYC-IfQ6ceydH0AZaDGIoH_wGrQZY,14
+spothomelight-1.0.4.dist-info/RECORD,,

spothomelight-1.0.2.dist-info/RECORD

@@ -1,14 +0,0 @@
-spothomelight/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spothomelight/auth.py,sha256=TGmR28lIBZnEVkMv7jIDBToZT3rcFUaqv4ZineIO-Do,1706
-spothomelight/config.py,sha256=URC1WwzZN2gRIfwNlMRwHNVtoviayYzmf6F0w3lMhLA,2274
-spothomelight/core.py,sha256=u87Q3BTdwbpjQIT4sZAK9-g79Rr-KHOepSLs2jDufPo,3002
-spothomelight/main.py,sha256=jX8esko2yj8c09HKBb1qmQloWE0mUQEc0F_CL27l5t8,1377
-spothomelight/service.py,sha256=hoVW79VDUG4P3upS3gPD79j1CqfrDnLJRlxk-lnOUkI,2943
-spothomelight/utils.py,sha256=TnGji05MKMTsoqWUq5wFPx6jLthqA-KWVH-dCu5VbIc,1814
-spothomelight/utils_median_cut.py,sha256=9sqUBk0ZpHWwfoPl4YPRcljE_K05w8trZFQo8bVCMds,1991
-spothomelight-1.0.2.dist-info/licenses/LICENSE,sha256=_r815CZLcqdQJmXH7FeFNoBT8gmiGtsdqo4aynUS-DM,1065
-spothomelight-1.0.2.dist-info/METADATA,sha256=x7w9aIeozpXKvF1-glT_KcO6s4RvUgXEKNue79TlkBc,4545
-spothomelight-1.0.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-spothomelight-1.0.2.dist-info/entry_points.txt,sha256=f9haGAoi-aXDTCkoxuSkdN78sHbvfbrr9gwaOIewuvw,58
-spothomelight-1.0.2.dist-info/top_level.txt,sha256=70ecLHIP1BNR5ZLYC-IfQ6ceydH0AZaDGIoH_wGrQZY,14
-spothomelight-1.0.2.dist-info/RECORD,,