fix bugs

ackness · Aug 22, 2021 · 3cd9d50 · 3cd9d50
1 parent 9c66df8
commit 3cd9d50
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 16 deletions.
diff --git a/setup.py b/setup.py
@@ -2,9 +2,8 @@
 
 setup(
     name='szu-autoconnect',
-    packages=find_packages(include=['szu-autoconnect'], exclude=['build', 'dist']),
-    package_dir={'szu-autoconnect': 'szu-autoconnect'},
-    version='1.0.1',
+    packages=find_packages(),
+    version='1.0.2',
     license='MIT',
     description='A simple way to get different DEXs abis for block chains.',
     author='Yong',

diff --git a/szu-autoconnect/core/__init__.py b/szu-autoconnect/core/__init__.py
diff --git a/szu-autoconnect/only_ui.py b/szu-autoconnect/only_ui.py
diff --git a/szu_autoconnect/__init__.py b/szu_autoconnect/__init__.py
@@ -0,0 +1 @@
+from szu_autoconnect.core import auto, ui
diff --git a/szu-autoconnect/__init__.py → szu_autoconnect/core/__init__.py b/szu-autoconnect/__init__.py → szu_autoconnect/core/__init__.py
diff --git a/szu-autoconnect/core/auto.py → szu_autoconnect/core/auto.py b/szu-autoconnect/core/auto.py → szu_autoconnect/core/auto.py
diff --git a/szu-autoconnect/core/ui.py → szu_autoconnect/core/ui.py b/szu-autoconnect/core/ui.py → szu_autoconnect/core/ui.py
@@ -5,9 +5,8 @@
 import PySimpleGUI as sg
 from apscheduler.schedulers.background import BlockingScheduler
 
-from . import Connector
+from szu_autoconnect.core.auto import Connector
 
-# SETTINGS_FILE = path.join(path.dirname(__file__), r'settings.cfg')
 SETTINGS_FILE = 'settings.cfg'
 DEFAULT_SETTINGS = {
     'username': '',
@@ -231,6 +230,5 @@ def main_loop():
 
     window.close()
 
-
-if __name__ == '__main__':
-    main_loop()
+# if __name__ == '__main__':
+#     main_loop()
diff --git a/szu_autoconnect/open_ui.py b/szu_autoconnect/open_ui.py
@@ -0,0 +1,4 @@
+from szu_autoconnect.core.ui import main_loop
+
+if __name__ == '__main__':
+    main_loop()
diff --git a/szu-autoconnect/run.py → szu_autoconnect/run.py b/szu-autoconnect/run.py → szu_autoconnect/run.py
@@ -14,7 +14,7 @@ def build_config():
 
 def create_job(configs):
     import datetime
-    from .core.auto import Connector
+    from szu_autoconnect.core.auto import Connector
     from apscheduler.schedulers.background import BlockingScheduler
 
     assert configs.username != '', "please input your username with -u"
@@ -38,7 +38,7 @@ def create_job(configs):
 def run():
     config = build_config()
     if config.use_ui:
-        from .core import main_loop
+        from szu_autoconnect.core.ui import main_loop
 
         main_loop()
     else: