From 4e04ec9745439873a1ff845adcfeeba64dfa22a0 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Wed, 28 Jun 2023 15:21:24 +0800 Subject: [PATCH] bugfix --- appPublic/folderUtils.py | 4 +++- appPublic/uni_outip.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/appPublic/folderUtils.py b/appPublic/folderUtils.py index 1124484..ef4182e 100755 --- a/appPublic/folderUtils.py +++ b/appPublic/folderUtils.py @@ -68,10 +68,12 @@ def findAllDrives(): ## list all folder name under folder named by path # -def folderList(path) : +def listFolder(path, rescursive=False) : for name in os.listdir(path) : full_name = os.path.join(path,name) if os.path.isdir(full_name): + for f in listFolder(full_name, rescursive=rescursive): + yield f yield full_name def listFile(folder,suffixs=[],rescursive=False): diff --git a/appPublic/uni_outip.py b/appPublic/uni_outip.py index 260e2dd..88f7c25 100755 --- a/appPublic/uni_outip.py +++ b/appPublic/uni_outip.py @@ -14,11 +14,14 @@ def pmp_get_external_ip(): def upnp_get_external_ip(): try: igd = upnpclient.discover()[0] + print(igd.service_map) + s_names = [ n for n in igd.service_map.keys() if 'WAN' in n and 'Conn' in n] upnp = igd.service_map[s_names[0]] x = upnp.GetExternalIPAddress() return x.get('NewExternalIPAddress', None) - except: + except Exception as e: + print(f'e={e}') return None def ipgetter_get_external_ip():