From ec03a34c8585342e2272c9ce9afada822d1d05c8 Mon Sep 17 00:00:00 2001 From: tjcouch-sil Date: Wed, 12 Jun 2024 12:18:32 +0900 Subject: [PATCH] Small tune-ups --- c-sharp/Projects/LocalParatextProjects.cs | 11 ++++++----- .../Projects/ParatextProjectDataProviderFactory.cs | 1 - c-sharp/Projects/ScrTextExtensions.cs | 5 ++++- src/main/services/server-network-connector.service.ts | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/c-sharp/Projects/LocalParatextProjects.cs b/c-sharp/Projects/LocalParatextProjects.cs index 73bf50e95e..f93caa45fe 100644 --- a/c-sharp/Projects/LocalParatextProjects.cs +++ b/c-sharp/Projects/LocalParatextProjects.cs @@ -20,6 +20,12 @@ internal class LocalParatextProjects /// public const string EXTENSION_DATA_SUBDIRECTORY = "shared/platform.bible/extensions"; + private bool _isInitialized = false; + + private List _requiredProjectRootFiles = ["usfm.sty", "Attribution.md"]; + + private static readonly List _paratextProjectInterfaces = [ProjectInterfaces.Base, ProjectInterfaces.USFM_BookChapterVerse, ProjectInterfaces.USX_Chapter]; + public LocalParatextProjects() { ProjectRootFolder = Path.Join( @@ -124,11 +130,6 @@ protected static void CreateDirectory(string dir) #region Private properties and methods - private bool _isInitialized = false; - private List _requiredProjectRootFiles = ["usfm.sty", "Attribution.md"]; - - private static readonly List _paratextProjectInterfaces = [ProjectInterfaces.Base, ProjectInterfaces.USFM_BookChapterVerse, ProjectInterfaces.USX_Chapter]; - private static IEnumerable GetScrTexts() { return ScrTextCollection.ScrTexts(IncludeProjects.ScriptureOnly); } diff --git a/c-sharp/Projects/ParatextProjectDataProviderFactory.cs b/c-sharp/Projects/ParatextProjectDataProviderFactory.cs index 7d7f9f3dd2..7c1358e159 100644 --- a/c-sharp/Projects/ParatextProjectDataProviderFactory.cs +++ b/c-sharp/Projects/ParatextProjectDataProviderFactory.cs @@ -1,5 +1,4 @@ using System.Collections.Concurrent; -using System.Dynamic; using Paranext.DataProvider.MessageHandlers; using Paranext.DataProvider.MessageTransports; using Paranext.DataProvider.Services; diff --git a/c-sharp/Projects/ScrTextExtensions.cs b/c-sharp/Projects/ScrTextExtensions.cs index 70e3f82c56..c41a20b35f 100644 --- a/c-sharp/Projects/ScrTextExtensions.cs +++ b/c-sharp/Projects/ScrTextExtensions.cs @@ -8,7 +8,10 @@ internal static ProjectDetails GetProjectDetails(this ScrText scrText) { return new( scrText.Name, - new(scrText.Guid.ToString(), LocalParatextProjects.GetParatextProjectInterfaces()), + new( + scrText.Guid.ToString().ToUpperInvariant(), + LocalParatextProjects.GetParatextProjectInterfaces() + ), scrText.Directory ); } diff --git a/src/main/services/server-network-connector.service.ts b/src/main/services/server-network-connector.service.ts index 796fdf2ebb..80d64e4a8a 100644 --- a/src/main/services/server-network-connector.service.ts +++ b/src/main/services/server-network-connector.service.ts @@ -523,7 +523,7 @@ export default class ServerNetworkConnector implements INetworkConnector { if (responderId !== CLIENT_ID_UNKNOWN) break; logger.debug( - `Server network connector could not route request of type ${requestMessage.requestType} on attempt ${maxAttempts - attemptsRemaining + 1} of ${maxAttempts}.${attemptsRemaining === 1 ? '' : ' Retrying...'}`, + `Server network connector could not route client ${requestMessage.senderId}'s request ${requestMessage.requestId} of type ${requestMessage.requestType} on attempt ${maxAttempts - attemptsRemaining + 1} of ${maxAttempts}.${attemptsRemaining === 1 ? '' : ' Retrying...'}`, ); // No need to wait again after the last attempt fails