feat(config): switch configuration parsing to TOML and add google_lens support
This commit is contained in:
5 files changed
+266
-80
No files matched your search
+37
-10
@@ -9,10 +9,13 @@ module that needs dynamic configuration.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from typing import Any, Callable, Dict, List, Optional
|
||||
|
||||
from fabric.utils import Gio, GLib, get_relative_path, logger, os
|
||||
from tomlkit import document as toml_document
|
||||
from tomlkit import dump as toml_dump
|
||||
from tomlkit import load as toml_load
|
||||
from tomlkit.items import Integer, String, Bool, Array
|
||||
|
||||
|
||||
class ConfigService:
|
||||
@@ -30,11 +33,11 @@ class ConfigService:
|
||||
return
|
||||
|
||||
self._initialized = True
|
||||
self._config: Dict[str, Any] = {}
|
||||
self._config: Any = {}
|
||||
self._reload_callbacks: List[
|
||||
Callable[[Dict[str, Any], Dict[str, Any]], None]
|
||||
] = []
|
||||
self._config_file: str = get_relative_path("../../config/config.json")
|
||||
self._config_file: str = get_relative_path("../../config/config.toml")
|
||||
self._monitors: List[Gio.FileMonitor] = []
|
||||
self._reload_pending: bool = False
|
||||
self.RELOAD_DELAY_MS: int = 100
|
||||
@@ -61,9 +64,8 @@ class ConfigService:
|
||||
try:
|
||||
os.makedirs(os.path.dirname(self._config_file), exist_ok=True)
|
||||
with open(self._config_file, "w") as f:
|
||||
json.dump(self._config, f, indent=4)
|
||||
toml_dump(self._config, f)
|
||||
|
||||
# Manually trigger a reload to notify listeners immediately
|
||||
GLib.idle_add(self._reload_config)
|
||||
return True
|
||||
except Exception as e:
|
||||
@@ -90,21 +92,46 @@ class ConfigService:
|
||||
logger.error(f"An error occurred: {e}")
|
||||
self._monitors.clear()
|
||||
|
||||
@staticmethod
|
||||
def _dict_to_toml(d: dict) -> Any:
|
||||
doc = toml_document()
|
||||
for k, v in d.items():
|
||||
if isinstance(v, bool):
|
||||
doc[k] = Bool(v)
|
||||
elif isinstance(v, int):
|
||||
doc[k] = Integer(v)
|
||||
elif isinstance(v, str):
|
||||
doc[k] = String(v, String.STANDARD)
|
||||
elif isinstance(v, list):
|
||||
arr = Array()
|
||||
for item in v:
|
||||
if isinstance(item, bool):
|
||||
arr.append(Bool(item))
|
||||
elif isinstance(item, int):
|
||||
arr.append(Integer(item))
|
||||
elif isinstance(item, str):
|
||||
arr.append(String(item, String.STANDARD))
|
||||
else:
|
||||
arr.append(item)
|
||||
arr.set_multiline(True) if len(v) > 1 else None
|
||||
doc[k] = arr
|
||||
else:
|
||||
doc[k] = v
|
||||
return doc
|
||||
|
||||
def _load_config(self) -> None:
|
||||
try:
|
||||
if os.path.exists(self._config_file):
|
||||
with open(self._config_file, "r") as f:
|
||||
self._config = json.load(f)
|
||||
self._config = toml_load(f)
|
||||
else:
|
||||
try:
|
||||
from utils.constants import DEFAULT
|
||||
|
||||
# Ensure the config directory exists
|
||||
os.makedirs(os.path.dirname(self._config_file), exist_ok=True)
|
||||
self._config = self._dict_to_toml(DEFAULT)
|
||||
with open(self._config_file, "w") as f:
|
||||
json.dump(DEFAULT, f, indent=4)
|
||||
|
||||
self._config = DEFAULT.copy()
|
||||
toml_dump(self._config, f)
|
||||
logger.info(
|
||||
f"[ConfigService] Generated default config at {self._config_file}"
|
||||
)
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
import contextlib
|
||||
import tempfile
|
||||
import webbrowser
|
||||
from urllib.parse import quote
|
||||
|
||||
from fabric.core.service import Service
|
||||
from fabric.utils import logger, os
|
||||
|
||||
from utils.functions import run_command
|
||||
|
||||
DEFAULT_UPLOADER = "https://litterbox.catbox.moe/resources/internals/api.php"
|
||||
|
||||
|
||||
class GoogleLens(Service):
|
||||
"""Service to capture region and search with Google Lens."""
|
||||
|
||||
_instance = None
|
||||
|
||||
def __new__(cls):
|
||||
if cls._instance is None:
|
||||
cls._instance = super().__new__(cls)
|
||||
return cls._instance
|
||||
|
||||
@staticmethod
|
||||
def get_initial():
|
||||
if GoogleLens._instance is None:
|
||||
GoogleLens._instance = GoogleLens()
|
||||
return GoogleLens._instance
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
|
||||
def capture_region(self, dest_path):
|
||||
# Check for dependencies
|
||||
if run_command(["which", "grim"]).returncode != 0:
|
||||
raise RuntimeError("grim not found - please install it")
|
||||
|
||||
if run_command(["which", "slurp"]).returncode != 0:
|
||||
raise RuntimeError("slurp not found - please install it")
|
||||
|
||||
try:
|
||||
# Select region
|
||||
result = run_command(["slurp"], timeout=60)
|
||||
if result.returncode != 0:
|
||||
if result.returncode == 1:
|
||||
raise RuntimeError("Selection cancelled")
|
||||
raise RuntimeError(f"Failed to select region: {result.stderr}")
|
||||
|
||||
geom = (
|
||||
result.stdout.strip()
|
||||
if isinstance(result.stdout, str)
|
||||
else result.stdout.decode("utf-8").strip()
|
||||
)
|
||||
|
||||
if not geom:
|
||||
raise RuntimeError("No region selected")
|
||||
|
||||
# Capture selected region
|
||||
capture_result = run_command(["grim", "-g", geom, dest_path], timeout=60)
|
||||
if capture_result.returncode != 0:
|
||||
raise RuntimeError(f"Failed to capture region: {capture_result.stderr}")
|
||||
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"Failed to capture region: {e}")
|
||||
|
||||
def upload_file(self, uploader_url, file_path):
|
||||
url_resp = None
|
||||
|
||||
try:
|
||||
import mimetypes
|
||||
import uuid
|
||||
from urllib.request import Request, urlopen
|
||||
|
||||
boundary = f"----WebKitFormBoundary{uuid.uuid4().hex}"
|
||||
headers = {"Content-Type": f"multipart/form-data; boundary={boundary}"}
|
||||
|
||||
data = []
|
||||
fields = {
|
||||
"reqtype": "fileupload",
|
||||
"time": "1h",
|
||||
}
|
||||
|
||||
for name, value in fields.items():
|
||||
data.append(f"--{boundary}".encode())
|
||||
data.append(f'Content-Disposition: form-data; name="{name}"'.encode())
|
||||
data.append(b"")
|
||||
data.append(value.encode())
|
||||
|
||||
filename = os.path.basename(file_path)
|
||||
mime_type = mimetypes.guess_type(file_path)[0] or "application/octet-stream"
|
||||
|
||||
data.append(f"--{boundary}".encode())
|
||||
data.append(
|
||||
f'Content-Disposition: form-data; name="fileToUpload"; filename="{filename}"'.encode()
|
||||
)
|
||||
data.append(f"Content-Type: {mime_type}".encode())
|
||||
data.append(b"")
|
||||
with open(file_path, "rb") as f:
|
||||
data.append(f.read())
|
||||
|
||||
data.append(f"--{boundary}--".encode())
|
||||
data.append(b"")
|
||||
|
||||
body = b"\r\n".join(data)
|
||||
req = Request(uploader_url, data=body, headers=headers)
|
||||
|
||||
with urlopen(req, timeout=60) as response:
|
||||
url_resp = response.read().decode("utf-8").strip()
|
||||
except Exception as e:
|
||||
logger.error(f"Upload with urllib failed: {e}")
|
||||
|
||||
# Fallback to curl
|
||||
if url_resp is None:
|
||||
if run_command(["which", "curl"]).returncode != 0:
|
||||
raise RuntimeError("Neither requests module nor curl available")
|
||||
|
||||
cmd = [
|
||||
"curl",
|
||||
"-sS",
|
||||
"-F",
|
||||
"reqtype=fileupload",
|
||||
"-F",
|
||||
"time=1h",
|
||||
"-F",
|
||||
f"fileToUpload=@{file_path}",
|
||||
uploader_url,
|
||||
]
|
||||
result = run_command(cmd)
|
||||
if result.returncode != 0:
|
||||
raise RuntimeError(f"Upload failed: {result.stderr}")
|
||||
|
||||
url_resp = (
|
||||
result.stdout.strip()
|
||||
if isinstance(result.stdout, str)
|
||||
else result.stdout.decode("utf-8").strip()
|
||||
)
|
||||
|
||||
# catbox.moe returns the URL directly
|
||||
if (
|
||||
not url_resp
|
||||
or not isinstance(url_resp, str)
|
||||
or not url_resp.startswith("http")
|
||||
):
|
||||
raise RuntimeError(f"Invalid response from uploader: {url_resp}")
|
||||
|
||||
return url_resp
|
||||
|
||||
def search(self):
|
||||
tmp = tempfile.NamedTemporaryFile(
|
||||
prefix="google_lens_", suffix=".png", delete=False
|
||||
)
|
||||
tmp_path = tmp.name
|
||||
tmp.close()
|
||||
|
||||
try:
|
||||
# Capture region
|
||||
logger.info("Select a region...")
|
||||
self.capture_region(tmp_path)
|
||||
|
||||
# Upload
|
||||
logger.info("Uploading...")
|
||||
uploaded_url = self.upload_file(DEFAULT_UPLOADER, tmp_path)
|
||||
logger.info(f"Uploaded: {uploaded_url}")
|
||||
|
||||
# Open in Lens
|
||||
lens_url = f"https://lens.google.com/uploadbyurl?url={quote(uploaded_url, safe='')}"
|
||||
logger.info("Opening Google Lens...")
|
||||
webbrowser.open(lens_url)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error: {e}")
|
||||
finally:
|
||||
# Cleanup
|
||||
if os.path.exists(tmp_path):
|
||||
with contextlib.suppress(OSError):
|
||||
os.unlink(tmp_path)
|
||||
Reference in new issue
Block a user