morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

winrt beacon cleanups

Browse Source
This commit is contained in:
F. Duncanh
2025-10-31 23:53:46 -04:00
parent 930316ee0c
commit 7fab9107e6
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Bluetooth_LE_beacon/dbus/uxplay-beacon.py
View File

@@ -260,7 +260,7 @@ def check_file_exists(file_path):
port = struct.unpack('<H', data)[0] port = struct.unpack('<H', data)[0]
data = file.read(4) data = file.read(4)
pid = struct.unpack('<I', data)[0] pid = struct.unpack('<I', data)[0]
data = file.read(16) data = file.read()
pname = data.split(b'\0',1)[0].decode('utf-8') pname = data.split(b'\0',1)[0].decode('utf-8')
last_element_of_pname = os.path.basename(pname) last_element_of_pname = os.path.basename(pname)
test = check_process_name(pid, last_element_of_pname) test = check_process_name(pid, last_element_of_pname)

18
Bluetooth_LE_beacon/winrt/uxplay-beacon.py
View File

@@ -1,8 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# SPDX-License-Identifier: LGPL-2.1-or-later # SPDX-License-Identifier: LGPL-2.1-or-later
# adapted from https://github.com/bluez/bluez/blob/master/test/example-advertisement
#---------------------------------------------------------------- #----------------------------------------------------------------
# a standalone python-3.6 or later DBus-based AirPlay Service-Discovery Bluetooth LE beacon for UxPlay # a standalone python-3.6 or later winrt-based AirPlay Service-Discovery Bluetooth LE beacon for UxPlay
# (c) F. Duncanh, October 2025 # (c) F. Duncanh, October 2025
import gi import gi
@@ -14,7 +13,7 @@ except ImportError:
def setup_beacon(ipv4_str, port, advmin, advmax, index): def setup_beacon(ipv4_str, port, advmin, advmax, index):
print(f"setup_becaon port {ipv4_str}:{port} [{advin}:{advmax}] ({index})") print(f"setup_beacon port {ipv4_str}:{port} [{advmin}:{advmax}] ({index})")
def beacon_on(): def beacon_on():
print(f"beacon_on") print(f"beacon_on")
@@ -95,7 +94,7 @@ def check_file_exists(file_path):
port = struct.unpack('<H', data)[0] port = struct.unpack('<H', data)[0]
data = file.read(4) data = file.read(4)
pid = struct.unpack('<I', data)[0] pid = struct.unpack('<I', data)[0]
data = file.read(16) data = file.read()
pname = data.split(b'\0',1)[0].decode('utf-8') pname = data.split(b'\0',1)[0].decode('utf-8')
last_element_of_pname = os.path.basename(pname) last_element_of_pname = os.path.basename(pname)
test = check_process_name(pid, last_element_of_pname) test = check_process_name(pid, last_element_of_pname)
@@ -103,13 +102,9 @@ def check_file_exists(file_path):
if not beacon_is_running: if not beacon_is_running:
beacon_is_pending_on = True beacon_is_pending_on = True
else: else:
print(f'orphan beacon file {file_path} exists, but process {pname} (pid {pid}) is no longer active')
try:
os.remove(file_path)
print(f'File "{file_path}" deleted successfully.')
except FileNotFoundError:
print(f'File "{file_path}" not found.')
if beacon_is_running: if beacon_is_running:
print(f'orphan beacon file {file_path} exists, but process {pname} (pid {pid}) is no longer active')
# PermissionError prevents deletion of orphan beacon files in Windows systems
beacon_is_pending_off = True beacon_is_pending_off = True
else: else:
if beacon_is_running: if beacon_is_running:
@@ -180,7 +175,8 @@ if __name__ == '__main__':
epilog='Example: python beacon.py --ipv4 "192.168.1.100" --path "/home/user/ble" --AdvMin 100 --AdvMax 100"' epilog='Example: python beacon.py --ipv4 "192.168.1.100" --path "/home/user/ble" --AdvMin 100 --AdvMax 100"'
) )
home_dir = os.path.expanduser("~") home_dir = os.environ.get("HOME")
print(f"homedir = {home_dir}")
# Add arguments # Add arguments
parser.add_argument( parser.add_argument(
'--file', '--file',

6
uxplay.cpp
View File

@@ -360,12 +360,11 @@ static size_t write_metadata(const char *filename, const char *text) {
static int write_bledata( const uint32_t *pid, const char *process_name, const char *filename) { static int write_bledata( const uint32_t *pid, const char *process_name, const char *filename) {
char name[16] { 0 }; char name[16] { 0 };
size_t len = strlen(process_name); size_t len = strlen(process_name);
memcpy (name, process_name, (len > 15 ? 15 :len));
FILE *fp = fopen(filename, "wb"); FILE *fp = fopen(filename, "wb");
printf("port %u\n", raop_port); printf("port %u\n", raop_port);
size_t count = sizeof(uint16_t) * fwrite(&raop_port, sizeof(uint16_t), 1, fp); size_t count = sizeof(uint16_t) * fwrite(&raop_port, sizeof(uint16_t), 1, fp);
count += sizeof(uint32_t) * fwrite(pid, sizeof(uint32_t), 1, fp); count += sizeof(uint32_t) * fwrite(pid, sizeof(uint32_t), 1, fp);
count += fwrite(name, 1, sizeof(name), fp); count += sizeof(char) * len * fwrite(process_name, 1, len * sizeof(char), fp);
fclose(fp); fclose(fp);
return (int) count; return (int) count;
} }
@@ -2973,7 +2972,8 @@ int main (int argc, char *argv[]) {
#define PID_MAX 4194304 // 2^22 #define PID_MAX 4194304 // 2^22
if (ble_filename.length()) { if (ble_filename.length()) {
#ifdef _WIN32 #ifdef _WIN32
DWORD pid = GetCurrentProcessId(); DWORD winpid = GetCurrentProcessId();
uint32_t pid = (uint32_t) winpid;
g_assert(pid <= PID_MAX); g_assert(pid <= PID_MAX);
#else #else
pid_t pid = getpid(); pid_t pid = getpid();