From 914f48a92b08c6e1548103c1180b83ffebecebd6 Mon Sep 17 00:00:00 2001
From: BarsTiger <kit.barsic@gmail.com>
Date: Tue, 27 Jun 2023 22:49:28 +0300
Subject: [PATCH] Some refactor again

---
 dragonion_server/modules/server/__init__.py   |  5 ++++
 dragonion_server/utils/config/__init__.py     |  5 ++++
 dragonion_server/utils/onion/__init__.py      |  5 ++++
 dragonion_server/utils/onion/onion.py         |  2 +-
 .../utils/onion/tor_downloader.py             | 26 ++++++++++++++-----
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/dragonion_server/modules/server/__init__.py b/dragonion_server/modules/server/__init__.py
index 160dea1..7e031d0 100644
--- a/dragonion_server/modules/server/__init__.py
+++ b/dragonion_server/modules/server/__init__.py
@@ -1 +1,6 @@
 from .server import run
+
+
+__all__ = [
+    'run'
+]
diff --git a/dragonion_server/utils/config/__init__.py b/dragonion_server/utils/config/__init__.py
index bd83d17..d679cb6 100644
--- a/dragonion_server/utils/config/__init__.py
+++ b/dragonion_server/utils/config/__init__.py
@@ -1 +1,6 @@
 from . import db, models
+
+__all__ = [
+    'db',
+    'models'
+]
diff --git a/dragonion_server/utils/onion/__init__.py b/dragonion_server/utils/onion/__init__.py
index 8b2f564..d84c44a 100644
--- a/dragonion_server/utils/onion/__init__.py
+++ b/dragonion_server/utils/onion/__init__.py
@@ -1,2 +1,7 @@
 from .onion import Onion
 from .onion import get_available_port
+
+__all__ = [
+    'Onion',
+    'get_available_port'
+]
diff --git a/dragonion_server/utils/onion/onion.py b/dragonion_server/utils/onion/onion.py
index 426b019..06738de 100644
--- a/dragonion_server/utils/onion/onion.py
+++ b/dragonion_server/utils/onion/onion.py
@@ -49,7 +49,7 @@ class Onion(object):
     tor_cookie_auth_file: str
     tor_data_directory: tempfile.TemporaryDirectory
     tor_path: str = dirs.get_tor_paths()
-    tor_proc: subprocess.Popen
+    tor_proc: subprocess.Popen | None
     c: Controller
     connected_to_tor: bool = False
     auth_string: str
diff --git a/dragonion_server/utils/onion/tor_downloader.py b/dragonion_server/utils/onion/tor_downloader.py
index 7da2452..1ec33e0 100644
--- a/dragonion_server/utils/onion/tor_downloader.py
+++ b/dragonion_server/utils/onion/tor_downloader.py
@@ -16,7 +16,12 @@ def get_latest_version() -> str:
             return res
 
 
-def get_build() -> Literal['windows-x86_64', 'linux-x86_64', 'macos-x86_64', 'macos-aarch64']:
+def get_build() -> Literal[
+    'windows-x86_64',
+    'linux-x86_64',
+    'macos-x86_64',
+    'macos-aarch64'
+]:
     if sys.platform == 'win32':
         return 'windows-x86_64'
     elif sys.platform == 'linux':
@@ -31,18 +36,25 @@ def get_build() -> Literal['windows-x86_64', 'linux-x86_64', 'macos-x86_64', 'ma
         raise 'System not supported'
 
 
-def get_tor_expert_bundles(version: str = get_latest_version(), platform: str = get_build()):
-    return f'https://dist.torproject.org/torbrowser/{version}/tor-expert-bundle-{version}-{platform}.tar.gz'
+def get_tor_expert_bundles(version: str = get_latest_version(),
+                           platform: str = get_build()):
+    return f'https://dist.torproject.org/torbrowser/{version}/tor-expert-bundle-' \
+           f'{version}-{platform}.tar.gz'
 
 
 def download_tor(url: str = get_tor_expert_bundles(), dist: str = 'tor'):
     if not os.path.exists(dist):
         os.makedirs(dist)
 
-    (tar := tarfile.open(fileobj=io.BytesIO(requests.get(url).content), mode='r:gz')).extractall(members=[
-        tarinfo for tarinfo in tar.getmembers()
-        if tarinfo.name.startswith("tor/")
-    ], path=dist)
+    (tar := tarfile.open(fileobj=io.BytesIO(requests.get(url).content),
+                         mode='r:gz')).extractall(
+        members=
+        [
+            tarinfo
+            for tarinfo
+            in tar.getmembers()
+            if tarinfo.name.startswith("tor/")
+        ], path=dist)
 
 
 if __name__ == '__main__':