Skip to content

Commit 14f8505

Browse files
committed
Change the default value of Tsukikage WebSocket to ws://127.0.0.1:8768
1 parent debea0a commit 14f8505

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

JL.Core/Config/ConfigDBManager.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Globalization;
33
using JL.Core.Frontend;
44
using JL.Core.Statistics;
5+
using JL.Core.Utilities;
56
using JL.Core.Utilities.Database;
67
using Microsoft.Data.Sqlite;
78

@@ -31,6 +32,7 @@ UPDATE setting
3132
""";
3233

3334
private const string InsertedNewProfilesOnceV4SettingName = "InsertedNewProfilesOnceV4";
35+
private const string ChangedDefaultValueOfTsukikageOnceV4SettingName = "ChangedDefaultValueOfTsukikageOnceV4";
3436

3537
private static readonly string s_configsPath = Path.Join(AppInfo.ConfigPath, "Configs.sqlite");
3638

@@ -117,6 +119,7 @@ FOREIGN KEY (profile_id) REFERENCES profile (id) ON DELETE CASCADE
117119
InsertTsukikageProfile(connection);
118120

119121
InsertSetting(connection, InsertedNewProfilesOnceV4SettingName, bool.TrueString, ProfileUtils.GlobalProfileId);
122+
InsertSetting(connection, ChangedDefaultValueOfTsukikageOnceV4SettingName, bool.TrueString, ProfileUtils.GlobalProfileId);
120123
}
121124
else
122125
{
@@ -131,10 +134,23 @@ FOREIGN KEY (profile_id) REFERENCES profile (id) ON DELETE CASCADE
131134
if (!ProfileDBUtils.ProfileExists(connection, ProfileUtils.TsukikageProfileName))
132135
{
133136
InsertTsukikageProfile(connection);
137+
InsertSetting(connection, ChangedDefaultValueOfTsukikageOnceV4SettingName, bool.TrueString, ProfileUtils.GlobalProfileId);
134138
}
135139

136140
InsertSetting(connection, InsertedNewProfilesOnceV4SettingName, bool.TrueString, ProfileUtils.GlobalProfileId);
137141
}
142+
143+
bool changedDefaultValueOfTsukikageOnceV4 = GetValueFromConfigWithoutUpsert(connection, false, ChangedDefaultValueOfTsukikageOnceV4SettingName, ProfileUtils.GlobalProfileId);
144+
if (!changedDefaultValueOfTsukikageOnceV4)
145+
{
146+
ReadOnlySpan<int> profileIds = ProfileDBUtils.GetProfileIds(connection).AsReadOnlySpan();
147+
foreach (int profileId in profileIds)
148+
{
149+
UpdateSetting(connection, nameof(CoreConfigManager.TsukikageWebSocketUri), CoreConfigManager.Instance.TsukikageWebSocketUri.OriginalString, profileId);
150+
}
151+
152+
InsertSetting(connection, ChangedDefaultValueOfTsukikageOnceV4SettingName, bool.TrueString, ProfileUtils.GlobalProfileId);
153+
}
138154
}
139155
}
140156

JL.Core/Config/CoreConfigManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public sealed class CoreConfigManager
3030
public bool TextBoxTrimWhiteSpaceCharacters { get; private set; } = true;
3131
public bool TextBoxRemoveNewlines { get; private set; } // = false;
3232
public List<Uri> WebSocketUris { get; private set; } = [new("ws://127.0.0.1:6677")];
33-
public Uri TsukikageWebSocketUri { get; private set; } = new("ws://127.0.0.1:8765");
33+
public Uri TsukikageWebSocketUri { get; private set; } = new("ws://127.0.0.1:8768");
3434
public string MpvNamedPipePath { get; private set; } = "/tmp/mpv-socket";
3535
public bool CheckForJLUpdatesOnStartUp { get; private set; } = true;
3636
public bool TrackTermLookupCounts { get; private set; } // = false;

JL.Core/Config/ProfileDBUtils.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,27 @@ FROM profile
9999
return profiles;
100100
}
101101

102+
public static List<int> GetProfileIds(SqliteConnection connection)
103+
{
104+
using SqliteCommand command = connection.CreateCommand();
105+
106+
command.CommandText =
107+
"""
108+
SELECT id
109+
FROM profile;
110+
""";
111+
112+
using SqliteDataReader dataReader = command.ExecuteReader();
113+
114+
List<int> profiles = [];
115+
while (dataReader.Read())
116+
{
117+
profiles.Add(dataReader.GetInt32(0));
118+
}
119+
120+
return profiles;
121+
}
122+
102123
internal static bool ProfileExists(SqliteConnection connection)
103124
{
104125
using SqliteCommand command = connection.CreateCommand();

0 commit comments

Comments
 (0)