Compare commits

...

6 Commits

Author SHA1 Message Date
Fenopy
1160c24ad2 Merge pull request #156 from VRPirates/beta/RSL-2.31.1
Beta/rsl 2.31.1
2024-12-06 19:35:26 -06:00
fenopy
b2c8dd7d10 chore: linting 2024-12-06 18:33:04 -06:00
fenopy
59674fe781 fix: adult content filtering 2024-12-06 18:32:54 -06:00
fenopy
4b3b9b0558 version bump 2024-12-06 18:32:09 -06:00
Fenopy
866f8821a5 Merge pull request #155 from VRPirates/beta/RSL-2.31
fix: column sort for new popularity ratings
2024-12-06 13:26:07 -06:00
fenopy
2b4ec9af38 fix: column sort for new popularity ratings 2024-12-06 13:25:31 -06:00
5 changed files with 70 additions and 28 deletions

View File

@@ -42,7 +42,7 @@ public class ListViewColumnSorter : IComparer
ListViewItem listviewY = (ListViewItem)y;
// Determine if the column requires numeric comparison
if (SortColumn == 3 || SortColumn == 5 || SortColumn == 6) // Numeric columns: VersionCodeIndex, VersionNameIndex, DownloadsIndex
if (SortColumn == 3 || SortColumn == 5) // Numeric columns: VersionCodeIndex, VersionNameIndex
{
try
{

View File

@@ -76,7 +76,7 @@ namespace AndroidSideloader
SplashScreen = new Splash();
SplashScreen.Show();
// Check for Offline Mode or No RCLONE Updating
CheckCommandLineArguments();
@@ -227,10 +227,13 @@ namespace AndroidSideloader
{
_ = Logger.Log("Starting AndroidSideloader Application");
if (isOffline) {
if (isOffline)
{
SplashScreen.UpdateBackgroundImage(AndroidSideloader.Properties.Resources.splashimage_offline);
changeTitle("Starting in Offline Mode...");
} else {
}
else
{
// download dependencies
GetDependencies.downloadFiles();
SplashScreen.UpdateBackgroundImage(AndroidSideloader.Properties.Resources.splashimage);
@@ -1573,7 +1576,7 @@ namespace AndroidSideloader
Program.form.changeTitle("");
settings.CurrPckg = dir;
settings.Save();
settings.Save();
}
}
//if it's a file
@@ -2128,7 +2131,7 @@ namespace AndroidSideloader
newint++;
}
}
catch (Exception ex)
catch (Exception ex)
{
Logger.Log($"Exception occured in initListView (Unrecognized App Found): {ex.Message}", LogLevel.ERROR);
}
@@ -2346,15 +2349,15 @@ namespace AndroidSideloader
};
gamesToUpload.Add(game);
}
private async Task initMirrors()
{
_ = Logger.Log("Looking for Additional Mirrors...");
int index = 0;
await Task.Run(() => remotesList.Invoke(() =>
{
index = remotesList.SelectedIndex;
remotesList.Items.Clear();
await Task.Run(() => remotesList.Invoke(() =>
{
index = remotesList.SelectedIndex;
remotesList.Items.Clear();
}));
string[] mirrors = await Task.Run(() => RCLONE.runRcloneCommand_DownloadConfig("listremotes").Output.Split('\n'));
@@ -2366,9 +2369,9 @@ namespace AndroidSideloader
if (mirror.Contains("mirror"))
{
_ = Logger.Log(mirror.Remove(mirror.Length - 1));
await Task.Run(() => remotesList.Invoke(() =>
{
_ = remotesList.Items.Add(mirror.Remove(mirror.Length - 1).Replace("VRP-mirror", ""));
await Task.Run(() => remotesList.Invoke(() =>
{
_ = remotesList.Items.Add(mirror.Remove(mirror.Length - 1).Replace("VRP-mirror", ""));
}));
itemsCount++;
}
@@ -2736,17 +2739,22 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
{
bool doDownload = true;
bool skipRedownload = false;
if (settings.UseDownloadedFiles == true) {
if (settings.UseDownloadedFiles == true)
{
skipRedownload = true;
}
if (Directory.Exists(gameDirectory))
{
if (skipRedownload == true) {
if (Directory.Exists($"{settings.DownloadDir}\\{gameName}")) {
if (skipRedownload == true)
{
if (Directory.Exists($"{settings.DownloadDir}\\{gameName}"))
{
doDownload = false;
}
} else {
}
else
{
DialogResult res = FlexibleMessageBox.Show(Program.form,
$"{gameName} exists in destination directory.\r\nWould you like to overwrite it?",
"Download again?", MessageBoxButtons.YesNo);
@@ -2793,7 +2801,8 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
Utilities.Metrics.CountDownload(packagename, versioncode);
}
if (Directory.Exists(downloadDirectory)) {
if (Directory.Exists(downloadDirectory))
{
string[] partialFiles = Directory.GetFiles($"{downloadDirectory}", "*.partial");
foreach (string file in partialFiles)
{
@@ -3674,7 +3683,14 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
gamesListView.Items.Clear();
foreach (var match in matches)
{
if (settings.HideAdultContent && !match.SubItems[1].Text.Contains("(18+)"))
if (settings.HideAdultContent == true)
{
if (!match.SubItems[1].Text.Contains("(18+)"))
{
gamesListView.Items.Add(match);
}
}
else
{
gamesListView.Items.Add(match);
}
@@ -3836,7 +3852,8 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
}
webView21.Show();
try {
try
{
string query = $"{CurrentGameName} VR trailer"; // Create the search query by appending " VR trailer" to the current game name
string encodedQuery = WebUtility.UrlEncode(query);
string url = $"https://www.youtube.com/results?search_query={encodedQuery}";
@@ -3854,8 +3871,8 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
await WebView_CoreWebView2ReadyAsync(videoUrl);
}
catch (Exception ex)
{
catch (Exception ex)
{
Program.form.changeTitle($"Error loading Trailer: {ex.Message}");
Logger.Log("Error Loading Trailer");
Logger.Log(ex.Message);
@@ -4008,7 +4025,14 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
if (installedVersionInt < cloudVersionInt)
{
Game.ForeColor = colorFont_updateAvailable;
if (settings.HideAdultContent && !Game.SubItems[1].Text.Contains("(18+)"))
if (settings.HideAdultContent == true)
{
if (!Game.SubItems[1].Text.Contains("(18+)"))
{
GameList.Add(Game);
}
}
else
{
GameList.Add(Game);
}
@@ -4342,7 +4366,14 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
if (installedVersionInt == cloudVersionInt)
{
Game.ForeColor = colorFont_installedGame;
if (settings.HideAdultContent && !Game.SubItems[1].Text.Contains("(18+)"))
if (settings.HideAdultContent == true)
{
if (!Game.SubItems[1].Text.Contains("(18+)"))
{
GameList.Add(Game);
}
}
else
{
GameList.Add(Game);
}
@@ -4485,7 +4516,14 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g
if (!dontget)
{
Game.ForeColor = colorFont_donateGame;
if (settings.HideAdultContent && !Game.SubItems[1].Text.Contains("(18+)"))
if (settings.HideAdultContent == true)
{
if (!Game.SubItems[1].Text.Contains("(18+)"))
{
GameList.Add(Game);
}
}
else
{
GameList.Add(Game);
}

View File

@@ -13,7 +13,7 @@ namespace AndroidSideloader
private static readonly string RawGitHubUrl = "https://raw.githubusercontent.com/VRPirates/rookie";
private static readonly string GitHubUrl = "https://github.com/VRPirates/rookie";
public static readonly string LocalVersion = "2.31.0";
public static readonly string LocalVersion = "2.31.1";
public static string currentVersion = string.Empty;
public static string changelog = string.Empty;

View File

@@ -13,3 +13,7 @@ RSL 2.31
- Fix: Case insensitive package matching
- Chore: Add build batch
- Chore: Bump rclone to 1.68.2 (from 1.67.0)
RSL 2.31.1
- Fix: Filtering when Adult Content is shown

View File

@@ -1 +1 @@
2.31.0
2.31.1