fix: optimize logging for mkdir and refresh; bump version to v0.0.7

Author: syscc

service/syncJob/jobClient.py

@@ -403,7 +403,7 @@ def delFile(self, path, fileName, size):
             errMsg = str(e)
         self.delHook(path, fileName, None if isPath else size, status, errMsg, isPath, createTime)
 
-    def listDir(self, path, firstDst, spec, rootPath, isSrc=True):
+    def listDir(self, path, firstDst, spec, rootPath, isSrc=True, ignoreError=False):
         """
         列出目录
         self.job['useCacheT']: 扫描目标目录时，是否使用缓存，0-不使用，1-使用
@@ -415,13 +415,16 @@ def listDir(self, path, firstDst, spec, rootPath, isSrc=True):
         :param spec:
         :param rootPath:
         :param isSrc:
+        :param ignoreError: 是否忽略错误（不记录日志和回调）
         :return:
         """
         useCache = 1 if isSrc and not firstDst else self.job[f"useCache{'S' if isSrc else 'T'}"]
         scanInterval = self.job[f"scanInterval{'S' if isSrc else 'T'}"]
         try:
             return self.openlistClient.fileListApi(path, useCache, scanInterval, spec, rootPath)
         except Exception as e:
+            if ignoreError:
+                raise e
             logger = logging.getLogger()
             errMsg = G('scan_error').format(G('src' if isSrc else 'dst'), str(e))
             logger.error(errMsg)
@@ -441,7 +444,12 @@ def ensurePath(self, path):
             try:
                 self.openlistClient.fileListApi(cur, 0, scanInterval, None, cur)
             except Exception:
-                self.openlistClient.mkdir(cur, scanInterval)
+                try:
+                    self.openlistClient.mkdir(cur, scanInterval)
+                except Exception as e:
+                    logger = logging.getLogger()
+                    logger.error(f"Failed to mkdir: {cur}, error: {str(e)}")
+                    raise e
 
     def syncWithHave(self, srcPath, dstPath, spec, srcRootPath, dstRootPath, firstDst):
         """
@@ -459,7 +467,7 @@ def syncWithHave(self, srcPath, dstPath, spec, srcRootPath, dstRootPath, firstDs
         try:
             srcFiles = self.listDir(srcPath, firstDst, spec, srcRootPath)
             try:
-                dstFiles = self.listDir(dstPath, firstDst, spec, dstRootPath, False)
+                dstFiles = self.listDir(dstPath, firstDst, spec, dstRootPath, False, ignoreError=True)
             except Exception:
                 self.syncWithOutHave(srcPath, dstPath, spec, srcRootPath, dstRootPath, firstDst)
                 return
@@ -506,6 +514,8 @@ def syncWithOutHave(self, srcPath, dstPath, spec, srcRootPath, dstRootPath, firs
         except Exception as e:
             status = 7
             errMsg = str(e)
+            logger = logging.getLogger()
+            logger.error(f"SyncWithOutHave ensurePath failed: {dstPath}, error: {errMsg}")
         # 目录回调
         self.copyHook(srcPath, dstPath, None, None, status=status, errMsg=errMsg, isPath=1)
         if status != 2:

service/webhook/refreshService.py

@@ -1,18 +1,22 @@
 import re
 import os
 import time
+import logging
 
 from service.openlist import openlistService
 from service.notify import notifyService
 
 
 def _refresh_path(client, path):
+    logger = logging.getLogger()
     try:
         if not path.endswith('/'):
             path = path + '/'
         client.fileListApi(path, 0, 0, None, path)
+        logger.info(f"Refresh success: {path}")
         return True, None
     except Exception as e:
+        logger.error(f"Refresh failed: {path}, error: {str(e)}")
         return False, str(e)
 
 
@@ -64,8 +68,12 @@ def _select_latest_odc_prefix(client, prefix):
 
 
 def refresh_after_task(job, status):
+    logger = logging.getLogger()
     if status not in [2, 3]:
+        logger.info(f"Refresh skipped: status {status} not in [2, 3]")
         return
+    logger.info(f"Refresh start: job={job.get('remark')}, status={status}")
+    
     openlistId = int(job['openlistId'])
     client = openlistService.getClientById(openlistId)
     remark = job.get('remark') or ''
@@ -115,6 +123,9 @@ def _expand_targets(env_s):
         env_refresh = os.getenv('DST_REFRESH_TV') if is_tv else os.getenv('DST_REFRESH_MOV')
     else:
         env_refresh = os.getenv('SYNC_REFRESH_TV') if is_tv else os.getenv('SYNC_REFRESH_MOV')
+    
+    logger.info(f"Refresh env config: dst_used={dst_used}, env_refresh={env_refresh}")
+
     if env_refresh:
         raw = [p.strip() for p in re.split(r"[,;:]", env_refresh) if p and p.strip() != '']
         tv_prefix = _select_latest_odc_prefix(client, 'tv')
@@ -139,7 +150,11 @@ def _expand_targets(env_s):
                     seen.add(path)
     base_paths = dedup
     if not base_paths:
+        logger.info("Refresh skipped: no base_paths found")
         return
+    
+    logger.info(f"Refresh targets: {base_paths}")
+
     # 解析 Season 并刷新
     resolved = []
     for base in base_paths:
@@ -152,15 +167,20 @@ def _expand_targets(env_s):
             ok_list.append(p)
         else:
             fail_list.append(f"{p} ❌ {msg}")
+    
+    logger.info(f"Refresh result: ok={len(ok_list)}, fail={len(fail_list)}")
+
     notify_list = notifyService.getNotifyList(True)
     if not notify_list:
+        logger.info("Refresh notify skipped: no notify config")
         return
     title = ('目录刷新完成 ✔️' if not fail_list else '目录刷新失败 ❌')
     content = ("全部目录刷新成功：\n" + "\n".join(ok_list)) if not fail_list else ("以下目录刷新失败：\n" + "\n".join(fail_list))
     for notify in notify_list:
         try:
             notifyService.sendNotify(notify, title, content, False)
-        except Exception:
+        except Exception as e:
+            logger.error(f"Refresh notify failed: {str(e)}")
             pass
     key = f"{remark}:{status}"
     now = time.time()

version.txt

@@ -1,4 +1,4 @@
-v0.0.6,latest
+v0.0.7,latest
 
 
 该文件仅第一行有效，表示打包的版本。