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

Change log parsing back to how it used to be before DŽDŽDŽ

Browse Source
This commit is contained in:
Natsumi
2021-06-24 07:30:07 +12:00
parent 96c0ff9365
commit f57837e8e6
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
LogWatcher.cs
View File

@@ -184,31 +184,28 @@ namespace VRCX
continue;
}
if (line[34] == '[')
var offset = 34;
if (line[offset] == '[')
{
var offset = line.IndexOf("] ", 35, StringComparison.Ordinal);
if (offset >= 35)
if (ParseLogOnPlayerJoinedOrLeft(fileInfo, logContext, line, offset) == true ||
ParseLogLocation(fileInfo, logContext, line, offset) == true ||
ParseLogPortalSpawn(fileInfo, logContext, line, offset) == true ||
ParseLogNotification(fileInfo, logContext, line, offset) == true ||
ParseLogJoinBlocked(fileInfo, logContext, line, offset) == true ||
ParseLogAvatarPedestalChange(fileInfo, logContext, line, offset) == true ||
ParseLogVideoError(fileInfo, logContext, line, offset) == true ||
ParseLogVideoPlay(fileInfo, logContext, line, offset) == true)
{
offset += 2;
if (ParseLogOnPlayerJoinedOrLeft(fileInfo, logContext, line, offset) == true ||
ParseLogLocation(fileInfo, logContext, line, offset) == true ||
ParseLogPortalSpawn(fileInfo, logContext, line, offset) == true ||
ParseLogNotification(fileInfo, logContext, line, offset) == true ||
ParseLogJoinBlocked(fileInfo, logContext, line, offset) == true ||
ParseLogAvatarPedestalChange(fileInfo, logContext, line, offset) == true ||
ParseLogVideoPlay(fileInfo, logContext, line, offset) == true ||
ParseLogVideoError(fileInfo, logContext, line, offset) == true)
{
continue;
}
continue;
}
continue;
}
if (ParseLogShaderKeywordsLimit(fileInfo, logContext, line, 34) == true ||
ParseLogSDK2VideoPlay(fileInfo, logContext, line, 34) == true)
else
{
continue;
if (ParseLogShaderKeywordsLimit(fileInfo, logContext, line, offset) == true ||
ParseLogSDK2VideoPlay(fileInfo, logContext, line, offset) == true)
{
continue;
}
}
}
}
@@ -259,17 +256,18 @@ namespace VRCX
// 2020.10.31 23:36:31 Log - [RoomManager] Joining or Creating Room: VRChat Home
// 2020.10.31 23:36:31 Log - [RoomManager] Successfully joined room
// 2021.02.03 10:18:58 Log - [DŽDŽDžDžDžDŽDŽDžDžDŽDžDžDžDžDŽDŽDŽDžDžDŽDŽDžDžDžDžDŽDžDžDžDžDŽDŽDŽDŽDŽDžDŽDžDŽDŽDŽDžDžDŽDžDžDž] Destination fetching: wrld_4432ea9b-729c-46e3-8eaf-846aa0a37fdd
// 2021.06.23 12:02:56 Log - [Behaviour] Entering Room: VRChat Home
if (string.Compare(line, offset, "Entering Room: ", 0, 15, StringComparison.Ordinal) == 0)
if (string.Compare(line, offset, "[Behaviour] Entering Room: ", 0, 27, StringComparison.Ordinal) == 0)
{
var worldName = line.Substring(offset + 15);
var worldName = line.Substring(offset + 27);
logContext.RecentWorldName = worldName;
return true;
}
if (string.Compare(line, offset, "Joining wrld_", 0, 13, StringComparison.Ordinal) == 0)
if (string.Compare(line, offset, "[Behaviour] Joining wrld_", 0, 25, StringComparison.Ordinal) == 0)
{
var location = line.Substring(offset + 8);
var location = line.Substring(offset + 20);
AppendLog(new[]
{
@@ -297,7 +295,9 @@ namespace VRCX
// 2020.11.01 00:07:01 Log - [PlayerManager] Removed player 2 / Rize♡
// 2020.11.01 00:07:02 Log - [Player] Unregistering Rize♡
if (string.Compare(line, offset, "Initialized PlayerAPI \"", 0, 23, StringComparison.Ordinal) == 0)
// 2021.06.23 11:41:16 Log - [Behaviour] Initialized PlayerAPI "Natsumi-sama" is local
if (string.Compare(line, offset, "[Behaviour] Initialized PlayerAPI \"", 0, 35, StringComparison.Ordinal) == 0)
{
var pos = line.LastIndexOf("\" is ");
if (pos < 0)
@@ -305,7 +305,7 @@ namespace VRCX
return false;
}
var userDisplayName = line.Substring(offset + 23, pos - (offset + 23));
var userDisplayName = line.Substring(offset + 35, pos - (offset + 35));
var userType = line.Substring(pos + 5);
AppendLog(new[]
@@ -336,9 +336,9 @@ namespace VRCX
return true;
}*/
if (string.Compare(line, offset, "OnPlayerLeft ", 0, 13, StringComparison.Ordinal) == 0)
if (string.Compare(line, offset, "[Behaviour] OnPlayerLeft ", 0, 25, StringComparison.Ordinal) == 0)
{
var userDisplayName = line.Substring(offset + 13);
var userDisplayName = line.Substring(offset + 25);
AppendLog(new[]
{
@@ -358,7 +358,7 @@ namespace VRCX
{
// 2021.04.06 11:25:45 Log - [Network Processing] RPC invoked ConfigurePortal on (Clone [1600004] Portals/PortalInternalDynamic) for Natsumi-sama
if (string.Compare(line, offset, "RPC invoked ConfigurePortal on (Clone [", 0, 39, StringComparison.Ordinal) != 0)
if (string.Compare(line, offset, "[Network Processing] RPC invoked ConfigurePortal on (Clone [", 0, 60, StringComparison.Ordinal) != 0)
{
return false;
}
@@ -413,7 +413,7 @@ namespace VRCX
{
// 2021.04.07 09:34:37 Error - [Behaviour] Master is not sending any events! Moving to a new instance.
if (string.Compare(line, offset, "Master is not sending any events! Moving to a new instance.", 0, 59, StringComparison.Ordinal) != 0)
if (string.Compare(line, offset, "[Behaviour] Master is not sending any events! Moving to a new instance.", 0, 71, StringComparison.Ordinal) != 0)
{
return false;
}
@@ -433,12 +433,12 @@ namespace VRCX
{
// 2021.05.07 10:48:19 Log - [Network Processing] RPC invoked SwitchAvatar on AvatarPedestal for User
if (string.Compare(line, offset, "RPC invoked SwitchAvatar on AvatarPedestal for ", 0, 47, StringComparison.Ordinal) != 0)
if (string.Compare(line, offset, "[Network Processing] RPC invoked SwitchAvatar on AvatarPedestal for ", 0, 68, StringComparison.Ordinal) != 0)
{
return false;
}
var data = line.Substring(offset + 47);
var data = line.Substring(offset + 68);
AppendLog(new[]
{
@@ -456,12 +456,12 @@ namespace VRCX
// 2021.04.08 06:37:45 Error - [Video Playback] ERROR: Video unavailable
// 2021.04.08 06:40:07 Error - [Video Playback] ERROR: Private video
if (string.Compare(line, offset, "ERROR: ", 0, 7, StringComparison.Ordinal) != 0)
if (string.Compare(line, offset, "[Video Playback] ERROR: ", 0, 24, StringComparison.Ordinal) != 0)
{
return false;
}
var data = line.Substring(offset + 7);
var data = line.Substring(offset + 24);
AppendLog(new[]
{
@@ -478,7 +478,7 @@ namespace VRCX
{
// 2021.04.20 13:37:69 Log - [Video Playback] Attempting to resolve URL 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'
if (string.Compare(line, offset, "Attempting to resolve URL '", 0, 27, StringComparison.Ordinal) != 0)
if (string.Compare(line, offset, "[Video Playback] Attempting to resolve URL '", 0, 44, StringComparison.Ordinal) != 0)
{
return false;
}
@@ -488,7 +488,7 @@ namespace VRCX
{
return false;
}
var data = line.Substring(78);
var data = line.Substring(offset + 44);
data = data.Remove(data.Length - 1);
if (logContext.LastVideoURL == data)
@@ -548,7 +548,7 @@ namespace VRCX
{
// 2021.01.03 05:48:58 Log - [API] Received Notification: < Notification from username:pypy, sender user id:usr_4f76a584-9d4b-46f6-8209-8305eb683661 to of type: friendRequest, id: not_3a8f66eb-613c-4351-bee3-9980e6b5652c, created at: 01/14/2021 15:38:40 UTC, details: {{}}, type:friendRequest, m seen:False, message: ""> received at 01/02/2021 16:48:58 UTC
if (string.Compare(line, offset, "Received Notification: <", 0, 24, StringComparison.Ordinal) != 0)
if (string.Compare(line, offset, "[API] Received Notification: <", 0, 30, StringComparison.Ordinal) != 0)
{
return false;
}
@@ -559,7 +559,7 @@ namespace VRCX
return false;
}
var data = line.Substring(offset + 24, pos - (offset + 24));
var data = line.Substring(offset + 30, pos - (offset + 30));
AppendLog(new[]
{