Add: windscribevpn plugin

3 files changed, 14 insertions, 10 deletions

diff --git a/detection/tool/ProgramInit.py b/detection/tool/ProgramInit.py
index a6b19b1..39338bd 100644
--- a/detection/tool/ProgramInit.py
+++ b/detection/tool/ProgramInit.py
@@ -11,14 +11,11 @@ import os
 def dataFilerClear():
     # Clear detection1 data
     # print(os.path.join(os.getcwd()))
-    toolFunction.clear('PsiphonServerIP.txt')
-    toolFunction.clear_dir('logs/', git_keep=True)
-    toolFunction.clear_dir('data/feature', git_keep=True)
-    toolFunction.clear_dir('data/result', git_keep=True)
-    toolFunction.clear_dir('data/model/pic')
+    Functions.clear('PsiphonServerIP.txt')
+    Functions.clear_dir('logs/', git_keep=True)
+    # toolFunction.clear_dir('data/feature', git_keep=True)
+    # toolFunction.clear_dir('data/result', git_keep=True)
+    # toolFunction.clear_dir('data/model/pic')
 
-def modelClear():
-    os.remove("data/model/originModel.model")
-    os.remove('data/model/RFmodel.model')
 
 dataFilerClear()
diff --git a/detection/tool/__pycache__/Config.cpython-39.pyc b/detection/tool/__pycache__/Config.cpython-39.pyc
index 5a14ac8..85f08d2 100644
--- a/detection/tool/__pycache__/Config.cpython-39.pyc
+++ b/detection/tool/__pycache__/Config.cpython-39.pyc
diff --git a/detection/vpn_detector.py b/detection/vpn_detector.py
index 45090ba..e80bd64 100644
--- a/detection/vpn_detector.py
+++ b/detection/vpn_detector.py
@@ -190,13 +190,13 @@ if __name__ == '__main__':
         detector = IpvanishvpnServername(start_time, end_time)
     elif plugin_name == 'ipvanishvpn_serverip':
         from vpnservices.ipvanishvpn_serverip import IpvanishvpnServerip
-        detector = IpvanishvpnServerip(start_time, end_time)
+        detector = IpvanishvpnServerip()
     elif plugin_name == 'cyberghostvpn_servername':
         from vpnservices.cyberghostvpn_servername import CyberghostvpnServername
         detector = CyberghostvpnServername(start_time, end_time)
     elif plugin_name == 'cyberghostvpn_serverip':
         from vpnservices.cyberghostvpn_serverip import CyberghostvpnServerip
-        detector = CyberghostvpnServerip(start_time, end_time)
+        detector = CyberghostvpnServerip()
     elif plugin_name == 'geckovpn_serverip':
         from vpnservices.geckovpn_serverip import GeckovpnServerip
         detector = GeckovpnServerip(start_time, end_time)
@@ -212,11 +212,18 @@ if __name__ == '__main__':
     elif plugin_name == 'vpnunlimited_serverip':
         from vpnservices.vpnunlimited_serverip import VpnunlimitedServerip
         detector = VpnunlimitedServerip(start_time, end_time)
+    elif plugin_name == 'windscribevpn_servername':
+        from vpnservices.windscribevpn_servername import WindscribevpnServername
+        detector = WindscribevpnServername(start_time, end_time)
+    elif plugin_name == 'windscribevpn_serverip':
+        from vpnservices.windscribevpn_serverip import WindscribevpnServerip
+        detector = WindscribevpnServerip()
 
     else:
         print('Please input correct plugin name')
         exit()
 
+
     result_list = detector.find_server()
     if len(result_list) > 0:
         detector.save_to_knowledgebase(result_list, detector.object_type,