Update and refactor existing codebase

core/Constants.py

@@ -6,7 +6,8 @@ import os
 @dataclass(frozen=True)
 class Constants:
 
-    CLIENT_VERSION: Final[str] = '1.0.0'
+    SP_CLIENT_VERSION: Final[str] = '1.0.0'
+
     HOME: Final[str] = os.path.expanduser('~')
 
     CONFIG_HOME: Final[str] = os.environ.get('XDG_CONFIG_HOME') or os.path.join(HOME, '.config')
@@ -24,6 +25,6 @@ class Constants:
 
     SP_SESSION_STATE_HOME: Final[str] = SP_STATE_HOME + '/sessions'
 
-    SP_STORAGE_DATABASE: Final[str] = SP_DATA_HOME + '/storage.db'
+    SP_STORAGE_DATABASE_PATH: Final[str] = SP_DATA_HOME + '/storage.db'
 
     SP_API_BASE_URL: Final[str] = 'https://api.simplifiedprivacy.is/api/v1'

core/controllers/ApplicationVersionController.py

@@ -37,7 +37,7 @@ class ApplicationVersionController:
         applications = ApplicationController.get_all()
         application_versions = []
 
-        for application_code in [application.code for application in applications]:
+        for application_code in (application.code for application in applications):
 
             application_version_subset = WebServiceApiService.get_application_versions(application_code, proxies)
 

core/controllers/ClientController.py

@@ -21,7 +21,7 @@ class ClientController:
 
     @staticmethod
     def get_version():
-        return ClientVersionController.get(Constants.CLIENT_VERSION)
+        return ClientVersionController.get(Constants.SP_CLIENT_VERSION)
 
     @staticmethod
     def can_be_updated():

core/controllers/ConfigurationController.py

@@ -25,7 +25,7 @@ class ConfigurationController:
 
         configuration = ConfigurationController.get()
 
-        if configuration is None or configuration.connection not in ['system', 'tor']:
+        if configuration is None or configuration.connection not in ('system', 'tor'):
             raise UnknownConnectionTypeError('The preferred connection type could not be determined.')
 
         return configuration.connection

core/controllers/ConnectionController.py

@@ -89,12 +89,12 @@ class ConnectionController:
 
         if profile.connection.is_unprotected():
 
-                if not ConnectionController.system_uses_wireguard_interface():
+            if not ConnectionController.system_uses_wireguard_interface():
 
-                    if not force:
+                if not force:
-                        raise ConnectionUnprotectedError('Connection unprotected while the system is not using a WireGuard interface.')
+                    raise ConnectionUnprotectedError('Connection unprotected while the system is not using a WireGuard interface.')
-                    else:
+                else:
-                        ProfileController.disable(profile)
+                    ProfileController.disable(profile)
 
         if profile.connection.code == 'tor':
 

core/controllers/ProfileController.py

@@ -86,13 +86,13 @@ class ProfileController:
 
         if profile.is_system_profile():
 
-            profiles = ProfileController.get_all()
+            subjects = ProfileController.get_all().values()
 
-            for key, value in profiles.items():
+            for subject in subjects:
 
-                if type(value).__name__ == 'SessionProfile':
+                if subject.is_session_profile():
 
-                    if value.connection.is_unprotected() and ProfileController.is_enabled(value) and not force:
+                    if subject.connection.is_unprotected() and ProfileController.is_enabled(subject) and not force:
                         raise ConnectionUnprotectedError('Disabling this system connection would leave one or more sessions exposed.')
 
             if SystemStateController.exists():
@@ -174,7 +174,7 @@ class ProfileController:
     @staticmethod
     def attach_proxy_configuration(profile: Union[SessionProfile, SystemProfile]):
 
-        if type(profile).__name__ != 'SessionProfile':
+        if not profile.is_session_profile():
             return None
 
         if profile.subscription is None:
@@ -188,7 +188,7 @@ class ProfileController:
     @staticmethod
     def get_proxy_configuration(profile: Union[SessionProfile, SystemProfile]):
 
-        if type(profile).__name__ != 'SessionProfile':
+        if not profile.is_session_profile():
             return None
 
         profile.get_proxy_configuration()

core/models/Model.py

@@ -7,7 +7,7 @@ class Model:
     @staticmethod
     def _create_table_if_not_exists(table_name: str, table_definition: str, drop_existing: bool = False):
 
-        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE)
+        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE_PATH)
         cursor = connection.cursor()
 
         if drop_existing:
@@ -24,7 +24,7 @@ class Model:
         if parameters is None:
             parameters = []
 
-        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE)
+        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE_PATH)
         cursor = connection.cursor()
 
         cursor.row_factory = row_factory
@@ -37,7 +37,7 @@ class Model:
     @staticmethod
     def _query_exists(query: str, parameters):
 
-        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE)
+        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE_PATH)
         cursor = connection.cursor()
 
         response = cursor.execute('SELECT EXISTS(' + query + ')', parameters).fetchone()
@@ -51,7 +51,7 @@ class Model:
         if parameters is None:
             parameters = []
 
-        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE)
+        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE_PATH)
         cursor = connection.cursor()
 
         cursor.row_factory = row_factory
@@ -64,7 +64,7 @@ class Model:
     @staticmethod
     def _insert_many(query: str, tuple_factory, items):
 
-        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE)
+        connection = sqlite3.connect(Constants.SP_STORAGE_DATABASE_PATH)
         cursor = connection.cursor()
 
         cursor.executemany(query, map(tuple_factory, items))

core/models/Subscription.py

@@ -22,7 +22,7 @@ class Subscription:
     )
 
     def is_active(self):
-        return self.expires_at is not None and self.expires_at > datetime.now(tz=timezone.utc)
+        return self.expires_at is not None and self.expires_at > datetime.now(timezone.utc)
 
     @staticmethod
     def from_iso_format(datetime_string: str):

core/models/SubscriptionPlan.py

@@ -38,7 +38,7 @@ class SubscriptionPlan(Model):
         features_proxy = False
         features_wireguard = False
 
-        if type(connection).__name__ == 'SessionConnection':
+        if connection.is_session_connection():
             if connection.masked:
                 features_proxy = True
 
@@ -61,7 +61,7 @@ class SubscriptionPlan(Model):
             features_proxy = False
             features_wireguard = False
 
-            if type(connection).__name__ == 'SessionConnection':
+            if connection.is_session_connection():
                 if connection.masked:
                     features_proxy = True
 

main.py

@@ -172,7 +172,7 @@ if __name__ == '__main__':
 
                     manage_subscription_input = None
 
-                    while manage_subscription_input not in ['1', '2', '3', '']:
+                    while manage_subscription_input not in ('1', '2', '3', ''):
 
                         print('Please select from the following:\n')