Skip to content

Commit 6f12c94

Browse files
OrthamOrtham
committed
Update default masterlist branch to v0.26
1 parent a0affbe commit 6f12c94

File tree

7 files changed

+34
-31
lines changed

7 files changed

+34
-31
lines changed

‎scripts/installer.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define MyAppURL "https://loot.github.io"
99
#define MyAppExeName "LOOT.exe"
1010

11-
#define MasterlistBranch "v0.21"
11+
#define MasterlistBranch "v0.26"
1212

1313
#if FileExists(AddBackslash(SourcePath) + '..\build\inno\ChineseSimplified.isl')
1414
#define SimplifiedChineseExists

‎scripts/prepare_installer.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ErrorActionPreference = "Stop"
22

3-
$masterlistBranch = "v0.21"
3+
$masterlistBranch = "v0.26"
44

55
function DownloadLanguageFile($languageFile, $parentPath) {
66
New-Item -ItemType "directory" -Force $parentPath

‎src/gui/state/game/game_settings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
namespace loot {
3838
static constexpr const char* MASTERLIST_FILENAME = "masterlist.yaml";
39-
static constexpr const char* DEFAULT_MASTERLIST_BRANCH = "v0.21";
39+
static constexpr const char* DEFAULT_MASTERLIST_BRANCH = "v0.26";
4040

4141
std::string GetDefaultMasterlistUrl(const std::string& repositoryName);
4242

‎src/gui/state/loot_settings.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ static const std::set<std::string> oldDefaultBranches({"master",
135135
"v0.14",
136136
"v0.15",
137137
"v0.17",
138-
"v0.18"});
138+
"v0.18",
139+
"v0.21"});
139140

140141
static const std::regex GITHUB_REPO_URL_REGEX =
141142
std::regex(R"(^https://github\.com/([^/]+)/([^/]+?)(?:\.git)?/?$)",
@@ -496,12 +497,14 @@ std::string migrateMasterlistSource(const std::string& source) {
496497
}
497498
}
498499

499-
auto migrated = migrateMasterlistSource(source, "skyrimvr", "v0.21");
500+
auto migrated =
501+
migrateMasterlistSource(source, "skyrimvr", DEFAULT_MASTERLIST_BRANCH);
500502
if (migrated.has_value()) {
501503
return migrated.value();
502504
}
503505

504-
migrated = migrateMasterlistSource(source, "fallout4vr", "v0.21");
506+
migrated =
507+
migrateMasterlistSource(source, "fallout4vr", DEFAULT_MASTERLIST_BRANCH);
505508
if (migrated.has_value()) {
506509
return migrated.value();
507510
}

‎src/tests/gui/state/game/detection/detail_test.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ TEST(AppendNewGamesSettings,
458458
EXPECT_EQ("Enderal: Forgotten Stories", gamesSettings[0].Name());
459459
EXPECT_EQ("Skyrim.esm", gamesSettings[0].Master());
460460
EXPECT_EQ(
461-
"https://raw.githubusercontent.com/loot/enderal/v0.21/masterlist.yaml",
461+
"https://raw.githubusercontent.com/loot/enderal/v0.26/masterlist.yaml",
462462
gamesSettings[0].MasterlistSource());
463463
EXPECT_EQ(installPath, gamesSettings[0].GamePath());
464464
EXPECT_EQ(localPath, gamesSettings[0].GameLocalPath());
@@ -468,7 +468,7 @@ TEST(AppendNewGamesSettings,
468468
EXPECT_EQ("Nehrim - At Fate's Edge", gamesSettings[1].Name());
469469
EXPECT_EQ("Nehrim.esm", gamesSettings[1].Master());
470470
EXPECT_EQ(
471-
"https://raw.githubusercontent.com/loot/oblivion/v0.21/masterlist.yaml",
471+
"https://raw.githubusercontent.com/loot/oblivion/v0.26/masterlist.yaml",
472472
gamesSettings[1].MasterlistSource());
473473
}
474474

‎src/tests/gui/state/game/game_settings_test.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ TEST_P(GameSettingsTest,
110110
EXPECT_EQ("Fallout3.esm", settings_.Master());
111111
EXPECT_EQ(0.94f, settings_.MinimumHeaderVersion());
112112
EXPECT_EQ(
113-
"https://raw.githubusercontent.com/loot/fallout3/v0.21/"
113+
"https://raw.githubusercontent.com/loot/fallout3/v0.26/"
114114
"masterlist.yaml",
115115
settings_.MasterlistSource());
116116
break;
@@ -119,7 +119,7 @@ TEST_P(GameSettingsTest,
119119
EXPECT_EQ("FalloutNV.esm", settings_.Master());
120120
EXPECT_EQ(1.32f, settings_.MinimumHeaderVersion());
121121
EXPECT_EQ(
122-
"https://raw.githubusercontent.com/loot/falloutnv/v0.21/"
122+
"https://raw.githubusercontent.com/loot/falloutnv/v0.26/"
123123
"masterlist.yaml",
124124
settings_.MasterlistSource());
125125
break;
@@ -128,7 +128,7 @@ TEST_P(GameSettingsTest,
128128
EXPECT_EQ("Fallout4.esm", settings_.Master());
129129
EXPECT_EQ(0.95f, settings_.MinimumHeaderVersion());
130130
EXPECT_EQ(
131-
"https://raw.githubusercontent.com/loot/fallout4/v0.21/"
131+
"https://raw.githubusercontent.com/loot/fallout4/v0.26/"
132132
"masterlist.yaml",
133133
settings_.MasterlistSource());
134134
break;
@@ -138,7 +138,7 @@ TEST_P(GameSettingsTest,
138138
// TODO: Get the real value off someone who owns Fallout 4 VR.
139139
EXPECT_EQ(0.95f, settings_.MinimumHeaderVersion());
140140
EXPECT_EQ(
141-
"https://raw.githubusercontent.com/loot/fallout4/v0.21/"
141+
"https://raw.githubusercontent.com/loot/fallout4/v0.26/"
142142
"masterlist.yaml",
143143
settings_.MasterlistSource());
144144
break;
@@ -147,7 +147,7 @@ TEST_P(GameSettingsTest,
147147
EXPECT_EQ("Morrowind.esm", settings_.Master());
148148
EXPECT_EQ(1.2f, settings_.MinimumHeaderVersion());
149149
EXPECT_EQ(
150-
"https://raw.githubusercontent.com/loot/morrowind/v0.21/"
150+
"https://raw.githubusercontent.com/loot/morrowind/v0.26/"
151151
"masterlist.yaml",
152152
settings_.MasterlistSource());
153153
break;
@@ -156,7 +156,7 @@ TEST_P(GameSettingsTest,
156156
EXPECT_EQ("Oblivion.esm", settings_.Master());
157157
EXPECT_EQ(0.8f, settings_.MinimumHeaderVersion());
158158
EXPECT_EQ(
159-
"https://raw.githubusercontent.com/loot/oblivion/v0.21/"
159+
"https://raw.githubusercontent.com/loot/oblivion/v0.26/"
160160
"masterlist.yaml",
161161
settings_.MasterlistSource());
162162
break;
@@ -165,15 +165,15 @@ TEST_P(GameSettingsTest,
165165
EXPECT_EQ("Skyrim.esm", settings_.Master());
166166
EXPECT_EQ(0.94f, settings_.MinimumHeaderVersion());
167167
EXPECT_EQ(
168-
"https://raw.githubusercontent.com/loot/skyrim/v0.21/masterlist.yaml",
168+
"https://raw.githubusercontent.com/loot/skyrim/v0.26/masterlist.yaml",
169169
settings_.MasterlistSource());
170170
break;
171171
case GameId::tes5se:
172172
EXPECT_EQ("TES V: Skyrim Special Edition", settings_.Name());
173173
EXPECT_EQ("Skyrim.esm", settings_.Master());
174174
EXPECT_EQ(1.7f, settings_.MinimumHeaderVersion());
175175
EXPECT_EQ(
176-
"https://raw.githubusercontent.com/loot/skyrimse/v0.21/"
176+
"https://raw.githubusercontent.com/loot/skyrimse/v0.26/"
177177
"masterlist.yaml",
178178
settings_.MasterlistSource());
179179
break;
@@ -183,7 +183,7 @@ TEST_P(GameSettingsTest,
183183
// TODO: Get the real value off someone who owns Skyrim VR.
184184
EXPECT_EQ(1.7f, settings_.MinimumHeaderVersion());
185185
EXPECT_EQ(
186-
"https://raw.githubusercontent.com/loot/skyrimse/v0.21/"
186+
"https://raw.githubusercontent.com/loot/skyrimse/v0.26/"
187187
"masterlist.yaml",
188188
settings_.MasterlistSource());
189189
break;
@@ -192,7 +192,7 @@ TEST_P(GameSettingsTest,
192192
EXPECT_EQ("Oblivion.esm", settings_.Master());
193193
EXPECT_EQ(0.8f, settings_.MinimumHeaderVersion());
194194
EXPECT_EQ(
195-
"https://raw.githubusercontent.com/loot/oblivion/v0.21/"
195+
"https://raw.githubusercontent.com/loot/oblivion/v0.26/"
196196
"masterlist.yaml",
197197
settings_.MasterlistSource());
198198
break;

‎src/tests/gui/state/loot_settings_test.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ TEST_F(LootSettingsTest, defaultConstructorShouldSetDefaultValues) {
100100
EXPECT_FALSE(settings_.getFilters().hideOfficialPluginsCleaningMessages);
101101
EXPECT_FALSE(settings_.getFilters().hideInactivePlugins);
102102
EXPECT_FALSE(settings_.getFilters().hideMessagelessPlugins);
103-
EXPECT_EQ("https://raw.githubusercontent.com/loot/prelude/v0.21/prelude.yaml",
103+
EXPECT_EQ("https://raw.githubusercontent.com/loot/prelude/v0.26/prelude.yaml",
104104
settings_.getPreludeSource());
105105
EXPECT_TRUE(settings_.getGameSettings().empty());
106106

@@ -756,7 +756,7 @@ TEST_F(
756756
settings_.load(settingsFile_);
757757

758758
const auto expectedSource =
759-
"https://raw.githubusercontent.com/loot/oblivion/v0.21/masterlist.yaml";
759+
"https://raw.githubusercontent.com/loot/oblivion/v0.26/masterlist.yaml";
760760
EXPECT_EQ(expectedSource, settings_.getGameSettings()[0].MasterlistSource());
761761
}
762762

@@ -776,7 +776,7 @@ TEST_F(LootSettingsTest,
776776
settings_.load(settingsFile_);
777777

778778
const auto expectedSource =
779-
"https://raw.githubusercontent.com/loot/skyrimse/v0.21/masterlist.yaml";
779+
"https://raw.githubusercontent.com/loot/skyrimse/v0.26/masterlist.yaml";
780780
EXPECT_EQ(expectedSource, settings_.getGameSettings()[0].MasterlistSource());
781781
}
782782

@@ -892,7 +892,7 @@ TEST_F(LootSettingsTest,
892892
settings_.load(settingsFile_);
893893

894894
auto expectedSource =
895-
"https://raw.githubusercontent.com/loot/oblivion-foo/v0.21/"
895+
"https://raw.githubusercontent.com/loot/oblivion-foo/v0.26/"
896896
"masterlist.yaml";
897897
EXPECT_EQ(expectedSource, settings_.getGameSettings()[0].MasterlistSource());
898898
}
@@ -962,15 +962,15 @@ TEST_F(LootSettingsTest, loadingTomlShouldUpdateSkyrimVrSourceFromOldDefaultSour
962962
<< "type = \"Skyrim VR\"" << endl
963963
<< "folder = \"Skyrim VR\"" << endl
964964
<< "masterlistSource = "
965-
"\"https://raw.githubusercontent.com/loot/skyrimvr/v0.21/"
965+
"\"https://raw.githubusercontent.com/loot/skyrimvr/v0.26/"
966966
"masterlist.yaml\""
967967
<< endl;
968968
out.close();
969969

970970
settings_.load(settingsFile_);
971971

972972
auto expectedSource =
973-
"https://raw.githubusercontent.com/loot/skyrimse/v0.21/masterlist.yaml";
973+
"https://raw.githubusercontent.com/loot/skyrimse/v0.26/masterlist.yaml";
974974
EXPECT_EQ(expectedSource, settings_.getGameSettings()[0].MasterlistSource());
975975
}
976976

@@ -1021,15 +1021,15 @@ TEST_F(LootSettingsTest,
10211021
<< "type = \"Fallout4VR\"" << endl
10221022
<< "folder = \"Fallout4VR\"" << endl
10231023
<< "masterlistSource = "
1024-
"\"https://raw.githubusercontent.com/loot/fallout4vr/v0.21/"
1024+
"\"https://raw.githubusercontent.com/loot/fallout4vr/v0.26/"
10251025
"masterlist.yaml\""
10261026
<< endl;
10271027
out.close();
10281028

10291029
settings_.load(settingsFile_);
10301030

10311031
auto expectedSource =
1032-
"https://raw.githubusercontent.com/loot/fallout4/v0.21/masterlist.yaml";
1032+
"https://raw.githubusercontent.com/loot/fallout4/v0.26/masterlist.yaml";
10331033
EXPECT_EQ(expectedSource, settings_.getGameSettings()[0].MasterlistSource());
10341034
}
10351035

@@ -1215,7 +1215,7 @@ TEST_F(
12151215
settings_.load(settingsFile_);
12161216

12171217
const auto expectedSource =
1218-
"https://raw.githubusercontent.com/loot/prelude/v0.21/prelude.yaml";
1218+
"https://raw.githubusercontent.com/loot/prelude/v0.26/prelude.yaml";
12191219
EXPECT_EQ(expectedSource, settings_.getPreludeSource());
12201220
}
12211221

@@ -1310,7 +1310,7 @@ TEST_F(LootSettingsTest,
13101310
settings_.load(settingsFile_);
13111311

13121312
auto expectedSource =
1313-
"https://raw.githubusercontent.com/loot/prelude/v0.21/"
1313+
"https://raw.githubusercontent.com/loot/prelude/v0.26/"
13141314
"prelude.yaml";
13151315
EXPECT_EQ(expectedSource, settings_.getPreludeSource());
13161316
}
@@ -1347,7 +1347,7 @@ TEST_F(
13471347
settings_.load(settingsFile_);
13481348

13491349
auto expectedSource =
1350-
"https://raw.githubusercontent.com/loot/prelude/v0.21/prelude.yaml";
1350+
"https://raw.githubusercontent.com/loot/prelude/v0.26/prelude.yaml";
13511351
EXPECT_EQ(expectedSource, settings_.getPreludeSource());
13521352
}
13531353

@@ -1366,7 +1366,7 @@ TEST_F(
13661366
settings_.load(settingsFile_);
13671367

13681368
auto expectedSource =
1369-
"https://raw.githubusercontent.com/loot/prelude/v0.21/prelude.yaml";
1369+
"https://raw.githubusercontent.com/loot/prelude/v0.26/prelude.yaml";
13701370
EXPECT_EQ(expectedSource, settings_.getPreludeSource());
13711371
}
13721372

@@ -1399,7 +1399,7 @@ TEST_F(
13991399
settings_.load(settingsFile_);
14001400

14011401
auto expectedSource =
1402-
"https://raw.githubusercontent.com/loot/prelude/v0.21/prelude.yaml";
1402+
"https://raw.githubusercontent.com/loot/prelude/v0.26/prelude.yaml";
14031403
EXPECT_EQ(expectedSource, settings_.getPreludeSource());
14041404
}
14051405

0 commit comments

Comments
 (0)