From 6020bc056d8992523ae62feb4edfbae10b169880 Mon Sep 17 00:00:00 2001 From: yum Date: Sun, 3 Sep 2023 19:29:44 -0700 Subject: Wire transcribe_v2.py into GUI Also: * Enable SO_REUSEADDR on browser src socket * Temporarily add evaluation dependencies to requirements.txt * Fix browser src. It's now looking for a prefix that the python app actually uses. --- GUI/GUI/GUI/Frame.cpp | 2 +- GUI/GUI/GUI/PythonWrapper.cpp | 2 +- GUI/GUI/GUI/WebServer.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'GUI') diff --git a/GUI/GUI/GUI/Frame.cpp b/GUI/GUI/GUI/Frame.cpp index a4c186b..9a781e8 100644 --- a/GUI/GUI/GUI/Frame.cpp +++ b/GUI/GUI/GUI/Frame.cpp @@ -2295,7 +2295,7 @@ void Frame::OnAppStart(wxCommandEvent& event) { transcript_.SetFinalized(false); } - std::regex pattern("^Transcription \\(([0-9]*\\.[0-9]+) seconds\\):"); + std::regex pattern("^Transcript: "); if (std::regex_search(out_line, pattern)) { std::string filtered_transcript = std::regex_replace(out_line, pattern, ""); filtered_transcript.erase(std::remove_if(filtered_transcript.begin(), filtered_transcript.end(), [](char c) { diff --git a/GUI/GUI/GUI/PythonWrapper.cpp b/GUI/GUI/GUI/PythonWrapper.cpp index d98a5d4..7141037 100644 --- a/GUI/GUI/GUI/PythonWrapper.cpp +++ b/GUI/GUI/GUI/PythonWrapper.cpp @@ -480,7 +480,7 @@ std::future PythonWrapper::StartApp( return InvokeWithArgs({ "-u", // Unbuffered output - "Resources/Scripts/transcribe.py", + "Resources/Scripts/transcribe_v2.py", "--config", config_path, }, std::move(out_cb), diff --git a/GUI/GUI/GUI/WebServer.cpp b/GUI/GUI/GUI/WebServer.cpp index ba7eecd..2b589c6 100644 --- a/GUI/GUI/GUI/WebServer.cpp +++ b/GUI/GUI/GUI/WebServer.cpp @@ -70,6 +70,12 @@ namespace WebServer { return false; } + int optval = 1; + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(optval)) == SOCKET_ERROR) { + Log(out_, "Failed to setsockopt(SO_REUSEADDR): {}", WSAGetLastError()); + return 1; + } + u_long enable_nonblock = 1; if (ioctlsocket(sock, FIONBIO, &enable_nonblock) == SOCKET_ERROR) { Log(out_, "Failed to enable non-blocking socket: {}\n", WSAGetLastError()); -- cgit v1.2.3