refactor: python package of ProxyBuilder

ProxyBuilder/ShadowsocksR.py

@@ -91,4 +91,4 @@ def load(proxyInfo, socksPort, configFile): # ShadowsocksR配置载入
         'protocol_param': proxyInfo['protocolParam'],
         'obfs': proxyInfo['obfs'],
         'obfs_param': proxyInfo['obfsParam']
-    })
+    })

ProxyBuilder/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding:utf-8 -*-
 
-from ProxyBuilder.main import build
-from ProxyBuilder.main import check
-from ProxyBuilder.main import destroy
+from ProxyBuilder.builder import *
+
+__all__ = [ 'build', 'check', 'destroy' ]

ProxyBuilder/__main__.py

@@ -0,0 +1,3 @@
+import ProxyBuilder.builder
+
+ProxyBuilder.builder.test()

ProxyBuilder/main.py → ProxyBuilder/builder.py

@@ -7,6 +7,7 @@ import ctypes
 import random
 import socket
 import subprocess
+
 from ProxyBuilder import Shadowsocks
 from ProxyBuilder import ShadowsocksR
 
@@ -129,3 +130,6 @@ def destroy(taskInfo): # 结束客户端并清理
     try:
         os.remove(taskInfo['file']) # 删除配置文件
     except: pass
+
+def test():
+    print("ProxyBuilder test")

demo.py

@@ -1,7 +1,7 @@
 import time
 import socket
 import requests
-import ProxyBuilder
+import ProxyBuilder as Builder
 
 def checkSocksPort(port):
     try:
@@ -40,11 +40,14 @@ testInfo = {
 }
 
 print("start")
+
+print(dir(Builder))
+
 print(testInfo)
-task = ProxyBuilder.build(testInfo, '/tmp/ProxyC')
+task = Builder.build(testInfo, '/tmp/ProxyC')
 print(task)
 time.sleep(1)
-if ProxyBuilder.check(task) == False:
+if Builder.check(task) == False:
     print("error exit")
 else:
     print("test with gstatic")
@@ -55,6 +58,5 @@ else:
         print("ok")
     else:
         print("error")
-    ProxyBuilder.destroy(task)
+    Builder.destroy(task)
     print("stop")
-