move Profile to __init__.py

Author: pvsr

qbpm/__init__.py

@@ -1,4 +1,51 @@
+from pathlib import Path
+from sys import platform
+from typing import Optional
+
+from xdg import BaseDirectory
+
+from .utils import error
+
 try:
     from qbpm.version import version as __version__  # type: ignore
 except ImportError:
     __version__ = "unknown"
+
+
+class Profile:
+    name: str
+    profile_dir: Path
+    root: Path
+
+    def __init__(self, name: str, profile_dir: Optional[Path]) -> None:
+        self.name = name
+        self.profile_dir = profile_dir or Path(
+            BaseDirectory.save_data_path("qutebrowser-profiles")
+        )
+        self.root = self.profile_dir / name
+
+    def check(self) -> Optional["Profile"]:
+        if "/" in self.name:
+            error("profile name cannot contain slashes")
+            return None
+        return self
+
+    def exists(self) -> bool:
+        return self.root.exists() and self.root.is_dir()
+
+    def cmdline(self) -> list[str]:
+        macos_app = "/Applications/qutebrowser.app/Contents/MacOS/qutebrowser"
+        if platform == "darwin" and Path(macos_app).exists():
+            qb = macos_app
+        else:
+            qb = "qutebrowser"
+        return [
+            qb,
+            "-B",
+            str(self.root),
+            "--qt-arg",
+            "name",
+            self.name,
+            "--desktop-file-name",
+            self.name,
+        ]

qbpm/main.py

@@ -4,8 +4,7 @@
 
 import click
 
-from . import operations, profiles
-from .profiles import Profile
+from . import Profile, operations, profiles
 from .utils import SUPPORTED_MENUS, default_profile_dir, error, user_data_dir
 
 CONTEXT_SETTINGS = {"help_option_names": ["-h", "--help"]}
@@ -162,7 +161,7 @@ def icon(profile_dir: Path, profile_name: str) -> None:
     profile = Profile(profile_name, profile_dir)
     if not profile.exists():
         error(f"profile {profile.name} not found at {profile.root}")
-        exit(1)
+        sys.exit(1)
     profile.root / "config" / "config.py"
 
 

qbpm/operations.py

@@ -6,8 +6,7 @@
 
 from xdg import BaseDirectory
 
-from . import profiles
-from .profiles import Profile
+from . import Profile, profiles
 from .utils import AUTO_MENUS, error, installed_menus
 
 

qbpm/profiles.py

@@ -1,7 +1,6 @@
 import subprocess
 from functools import partial
 from pathlib import Path
-from sys import platform
 from tempfile import TemporaryDirectory
 from typing import Optional
 
@@ -11,48 +10,10 @@
 from xdg import BaseDirectory
 from xdg.DesktopEntry import DesktopEntry
 
+from . import Profile
 from .utils import error, user_config_dir
 
 
-class Profile:
-    name: str
-    profile_dir: Path
-    root: Path
-
-    def __init__(self, name: str, profile_dir: Optional[Path]) -> None:
-        self.name = name
-        self.profile_dir = profile_dir or Path(
-            BaseDirectory.save_data_path("qutebrowser-profiles")
-        )
-        self.root = self.profile_dir / name
-
-    def check(self) -> Optional["Profile"]:
-        if "/" in self.name:
-            error("profile name cannot contain slashes")
-            return None
-        return self
-
-    def exists(self) -> bool:
-        return self.root.exists() and self.root.is_dir()
-
-    def cmdline(self) -> list[str]:
-        macos_app = "/Applications/qutebrowser.app/Contents/MacOS/qutebrowser"
-        if platform == "darwin" and Path(macos_app).exists():
-            qb = macos_app
-        else:
-            qb = "qutebrowser"
-        return [
-            qb,
-            "-B",
-            str(self.root),
-            "--qt-arg",
-            "name",
-            self.name,
-            "--desktop-file-name",
-            self.name,
-        ]
-
-
 def create_profile(profile: Profile, overwrite: bool = False) -> bool:
     if not profile.check():
         return False