MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-18 14:23:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle error parsing scuffed config.json

Browse Source
This commit is contained in:
Natsumi
2025-05-27 02:02:55 +10:00
parent 9bd5c79a71
commit 78daeac736
3 changed files with 73 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Dotnet/AppApi/Cef/Folders.cs
View File

@@ -44,28 +44,35 @@ namespace VRCX
}
catch (Exception e)
{
logger.Error(e);
return defaultPath;
logger.Error($"Error reading VRChat config file for cache location: {e}");
}
return defaultPath;
}
public override string GetVRChatPhotosLocation()
{
var json = ReadConfigFile();
if (!string.IsNullOrEmpty(json))
var defaultPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "VRChat");
try
{
var obj = JsonConvert.DeserializeObject<JObject>(json);
if (obj["picture_output_folder"] != null)
{
var photosDir = (string)obj["picture_output_folder"];
if (!string.IsNullOrEmpty(photosDir) && Directory.Exists(photosDir))
{
return photosDir;
}
}
}
var json = ReadConfigFile();
if (string.IsNullOrEmpty(json))
return defaultPath;
return Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "VRChat");
var obj = JsonConvert.DeserializeObject<JObject>(json);
if (obj["picture_output_folder"] == null)
return defaultPath;
var photosDir = (string)obj["picture_output_folder"];
if (string.IsNullOrEmpty(photosDir) || !Directory.Exists(photosDir))
return defaultPath;
return photosDir;
}
catch (Exception e)
{
logger.Error($"Error reading VRChat config file for photos location: {e}");
}
return defaultPath;
}
public override string GetUGCPhotoLocation(string path = "")

70
Dotnet/AppApi/Electron/Folders.cs
View File

@@ -86,40 +86,58 @@ namespace VRCX
public override string GetVRChatCacheLocation()
{
var json = ReadConfigFile();
if (!string.IsNullOrEmpty(json))
var defaultPath = Path.Join(GetVRChatAppDataLocation(), "Cache-WindowsPlayer");
try
{
var json = ReadConfigFile();
if (string.IsNullOrEmpty(json))
return defaultPath;
var obj = JsonConvert.DeserializeObject<JObject>(json);
if (obj["cache_directory"] != null)
{
var cacheDir = (string)obj["cache_directory"];
if (!string.IsNullOrEmpty(cacheDir) && Directory.Exists(cacheDir))
{
return cacheDir;
}
}
if (obj["cache_directory"] == null)
return defaultPath;
var cacheDir = (string)obj["cache_directory"];
if (string.IsNullOrEmpty(cacheDir))
return defaultPath;
var cachePath = Path.Join(cacheDir, "Cache-WindowsPlayer");
if (!Directory.Exists(cacheDir))
return defaultPath;
return cachePath;
}
return Path.Join(GetVRChatAppDataLocation(), "Cache-WindowsPlayer");
catch (Exception e)
{
logger.Error($"Error reading VRChat config file for cache location: {e}");
}
return defaultPath;
}
public override string GetVRChatPhotosLocation()
{
var json = ReadConfigFile();
if (!string.IsNullOrEmpty(json))
var defaultPath = Path.Join(_vrcPrefixPath, "drive_c/users/steamuser/Pictures/VRChat");
try
{
var json = ReadConfigFile();
if (string.IsNullOrEmpty(json))
return defaultPath;
var obj = JsonConvert.DeserializeObject<JObject>(json);
if (obj["picture_output_folder"] != null)
{
var photosDir = (string)obj["picture_output_folder"];
if (!string.IsNullOrEmpty(photosDir) && Directory.Exists(photosDir))
{
return photosDir;
}
}
if (obj["picture_output_folder"] == null)
return defaultPath;
var photosDir = (string)obj["picture_output_folder"];
if (string.IsNullOrEmpty(photosDir) || !Directory.Exists(photosDir))
return defaultPath;
return photosDir;
}
return Path.Join(_vrcPrefixPath, "drive_c/users/steamuser/Pictures/VRChat");
catch (Exception e)
{
logger.Error($"Error reading VRChat config file for photos location: {e}");
}
return defaultPath;
}
public override string GetUGCPhotoLocation(string path = "")
@@ -263,7 +281,9 @@ namespace VRCX
}
};
process.Start();
return;
process.WaitForExit();
if (process.ExitCode == 0)
return;
}
catch (Exception)
{

7
src/classes/websocket.js
View File

@@ -554,11 +554,16 @@ export default class extends baseClass {
} else if (contentType === 'world') {
// hmm
} else if (contentType === 'created') {
// on avatar upload
// on avatar upload, might be gone now
} else if (contentType === 'avatargallery') {
// on avatar gallery image upload
} else if (contentType === 'invitePhoto') {
// on uploading invite photo
} else if (!contentType) {
console.log(
'content-refresh without contentType',
content
);
} else {
console.log(
'Unknown content-refresh type',