Tray/GUI support

default.nix

@@ -1,2 +1,2 @@
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.callPackage ./derivation.nix {}
+{ libsForQt5 ? import <nixpkgs> {} }:
+libsForQt5.callPackage ./derivation.nix {}

derivation.nix

@@ -1,12 +1,18 @@
-{ lib, pkgs, python38Packages }:
+{ lib, pkgs, python3Packages, qt5 }:
 
-with python38Packages;
+with python3Packages;
 
 buildPythonApplication rec {
-    pname = "rs3fc";
-    version = "1.0.7";
+  pname = "rs3fc";
+  version = "1.0.7";
 
-    nativeBuildInputs = [ pkgs.sshfs pkgs.gocryptfs ];
+  src = ./.;
 
-    src = ./.;
+  buildInputs = [pkgs.sshfs pkgs.gettext];
+  propagatedBuildInputs = [ pyqt5 secretstorage ];
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
 }

rs3f/__init__.py

@@ -19,6 +19,7 @@
 import hashlib
 import logging
 import os
+import re
 import socket
 import subprocess
 from typing import Callable, Optional, Union
@@ -39,6 +40,12 @@
 logger = logging.getLogger("rs3f")
 logger.setLevel(logging.DEBUG)
 
+# TODO needs to be more restrictive on the server extraction, but this isn't
+# meant to be foolproof
+RE_VOLUME = re.compile(
+    r"^(?P<volume>[a-z_][a-zA-Z0-9_-]{0,31})(@(?P<server>[^:@/]+?)(:(?P<port>\d{1,5}))?)?$"
+)
+
 
 class RS3FRuntimeError(RuntimeError):
     """Base runtime error class for all rs3f errors."""
@@ -161,7 +168,7 @@ def _get_remote_uid(target_user: str, server: str, port: Optional[int]) -> int:
         + (
             [
                 "-P",
-                port,
+                str(port),
             ]
             if port is not None
             else []

rs3fc/__init__.py

@@ -19,21 +19,14 @@
 from configparser import ConfigParser
 import logging
 import os
-import re
 import sys
 from typing import Optional
 
-from rs3f import __version__, connect, disconnect, RS3FRuntimeError
+from rs3f import __version__, connect, disconnect, RS3FRuntimeError, RE_VOLUME
 
 from .passwordfetchers import fetch_password, get_default_fetchers_order
 
 
-# TODO needs to be more restrictive on the server extraction, but this isn't
-# meant to be foolproof
-RE_VOLUME = re.compile(
-    r"^(?P<volume>[a-z_][a-zA-Z0-9_-]{0,31})(@(?P<server>[^:@/]+?)(:(?P<port>\d{1,5}))?)?$"
-)
-
 VERBOSE_FORMATTER = logging.Formatter(
     "%(levelname)s %(filename)s+%(lineno)d %(funcName)s: %(message)s"
 )