prim-ctrl 0.7.4__tar.gz → 0.7.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {prim_ctrl-0.7.4 → prim_ctrl-0.7.6}/PKG-INFO +1 -1
- {prim_ctrl-0.7.4 → prim_ctrl-0.7.6}/prim_ctrl/__main__.py +6 -2
- {prim_ctrl-0.7.4 → prim_ctrl-0.7.6}/pyproject.toml +1 -1
- {prim_ctrl-0.7.4 → prim_ctrl-0.7.6}/LICENSE +0 -0
- {prim_ctrl-0.7.4 → prim_ctrl-0.7.6}/README.md +0 -0
- {prim_ctrl-0.7.4 → prim_ctrl-0.7.6}/prim_ctrl/__init__.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: prim-ctrl
|
|
3
|
-
Version: 0.7.
|
|
3
|
+
Version: 0.7.6
|
|
4
4
|
Summary: Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN.
|
|
5
5
|
Home-page: https://github.com/lmagyar/prim-ctrl
|
|
6
6
|
License: Apache-2.0
|
|
@@ -143,7 +143,11 @@ class Subprocess:
|
|
|
143
143
|
command = ['tailscale']
|
|
144
144
|
command.extend(args)
|
|
145
145
|
creationflags = subprocess.CREATE_NO_WINDOW if platform.system().lower() == 'windows' else 0
|
|
146
|
-
|
|
146
|
+
try:
|
|
147
|
+
proc = await asyncio.create_subprocess_exec(*command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, creationflags=creationflags)
|
|
148
|
+
except FileNotFoundError as e:
|
|
149
|
+
e.add_note(f"Please check that Tailscale is installed properly")
|
|
150
|
+
raise
|
|
147
151
|
stdout, _stderr = await proc.communicate()
|
|
148
152
|
return proc.returncode == 0, stdout
|
|
149
153
|
|
|
@@ -867,7 +871,7 @@ class AutomatePhoneState(PhoneState):
|
|
|
867
871
|
|
|
868
872
|
# test funnel + webhooks availability, to not wait for a reply if funnel isn't configured properly
|
|
869
873
|
# though it will be routed locally, it will not go out to Tailscale's TCP forwarder servers, so the route is different from what Automate will see
|
|
870
|
-
test_timeout =
|
|
874
|
+
test_timeout = 30.0
|
|
871
875
|
logger.debug("Testing Funnel with calling local webhook (timeout is %ds)", int(test_timeout))
|
|
872
876
|
try:
|
|
873
877
|
await self.local_webhook_ping.wait_for(True, test_timeout)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "prim-ctrl"
|
|
3
|
-
version = "0.7.
|
|
3
|
+
version = "0.7.6"
|
|
4
4
|
description = "Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN."
|
|
5
5
|
license = "Apache-2.0"
|
|
6
6
|
authors = ["Laszlo Magyar <lmagyar1973@gmail.com>"]
|
|
File without changes
|
|
File without changes
|
|
File without changes
|