异常日志增加详细文件行号输出

sleikang · Feb 3, 2023 · 7f98e71 · 7f98e71
1 parent 52fcb64
commit 7f98e71
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 96 deletions.
diff --git a/api/douban.py b/api/douban.py
@@ -1,8 +1,11 @@
-from api.network import network
 import json
-import html2text
 import re
 
+import html2text
+
+from api.network import network
+
+
 class douban:
     host = None
     key = None
@@ -52,7 +55,7 @@ def get_movie_info(self, movieid : str):
                     iteminfo['info'][info[0]] = re.sub(pattern='\s+', repl='', string=info[1])
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def get_movie_celebrities_info(self, movieid : str):
@@ -69,7 +72,7 @@ def get_movie_celebrities_info(self, movieid : str):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def get_tv_info(self, tvid : str):
@@ -104,7 +107,7 @@ def get_tv_info(self, tvid : str):
                     iteminfo['info'][info[0]] = re.sub(pattern='\s+', repl='', string=info[1])
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def get_tv_celebrities_info(self, tvid : str):
@@ -121,7 +124,7 @@ def get_tv_celebrities_info(self, tvid : str):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def get_celebrity_info(self, celebrityid : str):
@@ -139,7 +142,7 @@ def get_celebrity_info(self, celebrityid : str):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def search_media_pc(self, title : str):
@@ -162,7 +165,7 @@ def search_media_pc(self, title : str):
             iteminfo['items'] = medialist
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def search_media(self, title : str):
@@ -180,7 +183,7 @@ def search_media(self, title : str):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def search_media_weixin(self, title : str):
@@ -198,7 +201,7 @@ def search_media_weixin(self, title : str):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def __get_status__(self, p, err):
@@ -215,7 +218,7 @@ def __get_status__(self, p, err):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
 
         return False
 
diff --git a/api/mediasql.py b/api/mediasql.py
@@ -43,7 +43,7 @@ def search_douban_media(self, mediatype : int, title : str):
                 return True, iteminfo
             return False, None
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, iteminfo
 
     def write_douban_media(self, mediatype : int, id : str, iteminfo):
@@ -74,7 +74,7 @@ def write_douban_media(self, mediatype : int, id : str, iteminfo):
                 ret = self.execution(sql="insert into douban_movie(id, media_id, media_name, media_brief, media_data, media_celebrities, update_time) values(null, ?, ?, ?, '', '', ?);", data=(id, iteminfo['title'], json.dumps(iteminfo), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
 
     def get_douban_media_info(self, mediatype : int, id : str):
@@ -102,7 +102,7 @@ def get_douban_media_info(self, mediatype : int, id : str):
                 return True, iteminfo
             return False, None
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, iteminfo
 
     def write_douban_media_info(self, mediatype : int, id : str, iteminfo):
@@ -133,7 +133,7 @@ def write_douban_media_info(self, mediatype : int, id : str, iteminfo):
                 ret = self.execution(sql="insert into douban_movie(id, media_id, media_name, media_brief, media_data, media_celebrities, update_time) values(null, ?, ?, '', ?, '', ?);", data=(id, iteminfo['title'], json.dumps(iteminfo), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
 
     def get_douban_celebrities_info(self, mediatype : int, id : str):
@@ -161,7 +161,7 @@ def get_douban_celebrities_info(self, mediatype : int, id : str):
                 return True, iteminfo
             return False, None
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, iteminfo
 
     def write_douban_celebrities_info(self, mediatype : int, id : str, iteminfo):
@@ -192,7 +192,7 @@ def write_douban_celebrities_info(self, mediatype : int, id : str, iteminfo):
                 ret = self.execution(sql="insert into douban_movie(id, media_id, media_name, media_brief, media_data, media_celebrities, update_time) values(null, ?, '', '', '', ?, ?);", data=(id, json.dumps(iteminfo), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
 
     def get_douban_people_info(self, id : str):
@@ -217,7 +217,7 @@ def get_douban_people_info(self, id : str):
                 return True, iteminfo
             return False, None
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, iteminfo
 
     def write_douban_people_info(self, id : str, iteminfo):
@@ -238,7 +238,7 @@ def write_douban_people_info(self, id : str, iteminfo):
             ret = self.execution(sql="insert into douban_people(id, people_id, people_name, people_data, update_time) values(null, ?, ?, ?, ?)", data=(id, iteminfo['title'], json.dumps(iteminfo), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
 
 
@@ -277,7 +277,7 @@ def get_tmdb_media_info(self, mediatype : int, id : str, language):
                 return True, json.loads(item)
             return False, None       
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, None
 
     def write_tmdb_media_info(self, mediatype : int, id : str, language, iteminfo):
@@ -320,7 +320,7 @@ def write_tmdb_media_info(self, mediatype : int, id : str, language, iteminfo):
                 ret = self.execution(sql="insert into tmdb_movie(id, media_id, media_name, {}, update_time) values(null, ?, ?, ?, ?);".format(key), data=(id, iteminfo['title'], json.dumps(iteminfo), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
 
     def get_tmdb_season_info(self, id : str, seasonid, language):
@@ -362,7 +362,7 @@ def get_tmdb_season_info(self, id : str, seasonid, language):
 
             return False, None        
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}][{}]异常错误：".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, None
 
     def write_tmdb_season_info(self, id : str, seasonid, language, iteminfo):
@@ -419,7 +419,7 @@ def write_tmdb_season_info(self, id : str, seasonid, language, iteminfo):
             ret = self.execution(sql="insert into tmdb_tv(id, media_id, {}, update_time) values(null, ?, ?, ?);".format(key), data=(id, json.dumps(data_array), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
 
     def get_tmdb_people_info(self, id : str, language):
@@ -453,7 +453,7 @@ def get_tmdb_people_info(self, id : str, language):
                 return True, json.loads(item)
             return False, None        
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False, None
 
     def write_tmdb_people_info(self, id : str, language, iteminfo):
@@ -486,5 +486,5 @@ def write_tmdb_people_info(self, id : str, language, iteminfo):
             ret = self.execution(sql="insert into tmdb_people(id, people_id, people_name, {}, update_time) values(null, ?, ?, ?, ?);".format(key), data=(id, iteminfo['name'], json.dumps(iteminfo), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
             return ret
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
             return False
diff --git a/api/nastools.py b/api/nastools.py
@@ -1,7 +1,9 @@
-from api.network import network
 import json
 from urllib import parse
 
+from api.network import network
+
+
 class nastools:
     client = None
     host = None
@@ -36,7 +38,7 @@ def name_test(self, name):
             iteminfo = json.loads(p.text)['data']['data']
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def media_info(self, name, year = None, type = 'MOV'):
@@ -62,7 +64,7 @@ def media_info(self, name, year = None, type = 'MOV'):
             iteminfo = json.loads(p.text)['data']
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def __login__(self):
@@ -83,7 +85,7 @@ def __login__(self):
             self.headers['Authorization'] = self.token
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False
 
     def __get_status__(self, p, err):
@@ -100,7 +102,7 @@ def __get_status__(self, p, err):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
 
         return False
 

diff --git a/api/server/emby.py b/api/server/emby.py
@@ -1,6 +1,8 @@
 import json
+
 from api.server.serverbase import serverbase
 
+
 class emby(serverbase):
 
     def get_items(self, parentid : str = '', type = None):
@@ -22,7 +24,7 @@ def get_items(self, parentid : str = '', type = None):
             items = json.loads(p.text)
             return True, items
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, items
 
     def get_items_count(self):
@@ -39,7 +41,7 @@ def get_items_count(self):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def get_item_info(self, itemid : str):
@@ -57,7 +59,7 @@ def get_item_info(self, itemid : str):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def set_item_info(self, itemid : str, iteminfo):
@@ -74,7 +76,7 @@ def set_item_info(self, itemid : str, iteminfo):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False
 
     def set_item_image(self, itemid : str, imageurl : str):
@@ -91,7 +93,7 @@ def set_item_image(self, itemid : str, imageurl : str):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False
 
     def search_movie(self, itemid, tmdbid, name = None, year = None):
@@ -113,7 +115,7 @@ def search_movie(self, itemid, tmdbid, name = None, year = None):
             iteminfo = json.loads(p.text)
             return True, iteminfo
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False, iteminfo
 
     def apply_search(self, itemid, iteminfo):
@@ -131,7 +133,7 @@ def apply_search(self, itemid, iteminfo):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False
 
     def refresh(self, itemid):
@@ -147,7 +149,7 @@ def refresh(self, itemid):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
         return False
 
     def __get_status__(self, p, err):
@@ -160,6 +162,6 @@ def __get_status__(self, p, err):
                 return False
             return True
         except Exception as result:
-            self.err = "异常错误：{}".format(result)
+            self.err = "文件[{}]行[{}]异常错误：{}".format(result.__traceback__.tb_frame.f_globals["__file__"], result.__traceback__.tb_lineno, result)
 
         return False