Adding installation path as part of parsing process (#15)

Shawson · Apr 19, 2020 · be649f9 · be649f9
1 parent 5ce52a8
commit be649f9
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 22 deletions.
diff --git a/OculusLibrary/ManifestParseException.cs b/OculusLibrary/ManifestParseException.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace OculusLibrary
+{
+    [Serializable]
+    public class ManifestParseException : Exception
+    {
+        public ManifestParseException() { }
+        public ManifestParseException(string message) : base(message) { }
+        public ManifestParseException(string message, Exception inner) : base(message, inner) { }
+        protected ManifestParseException(
+          System.Runtime.Serialization.SerializationInfo info,
+          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+    }
+}
diff --git a/OculusLibrary/OculusLibrary.csproj b/OculusLibrary/OculusLibrary.csproj
@@ -51,6 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DataExtraction\IOculusPathSniffer.cs" />
+    <Compile Include="ManifestParseException.cs" />
     <Compile Include="OS\IPathNormaliser.cs" />
     <Compile Include="OS\IRegistryValueProvider.cs" />
     <Compile Include="OS\IWindowsManagementObjectQueryProvider.cs" />

diff --git a/OculusLibrary/OculusLibraryPlugin.cs b/OculusLibrary/OculusLibraryPlugin.cs
@@ -47,30 +47,31 @@ public override IEnumerable<GameInfo> GetGames()
 
             using (var view = PlayniteApi.WebViews.CreateOffscreenView())
             {
-                foreach (var oculusBasePath in oculusLibraryLocations)
+                foreach (var currentLibraryBasePath in oculusLibraryLocations)
                 {
-                    logger.Info($"Processing Oculus library location {oculusBasePath}");
+                    logger.Info($"Processing Oculus library location {currentLibraryBasePath}");
 
-                    foreach (var manifest in GetOculusAppManifests(oculusBasePath))
+                    foreach (var manifest in GetOculusAppManifests(currentLibraryBasePath))
                     {
                         logger.Info($"Processing manifest {manifest.CanonicalName} {manifest.AppId}");
 
                         try
                         {
-                            var executableFullPath = $@"{oculusBasePath}\Software\{manifest.CanonicalName}\{manifest.LaunchFile}";
+                            var installationPath = $@"{currentLibraryBasePath}\Software\{manifest.CanonicalName}";
+                            var executableFullPath = $@"{installationPath}\{manifest.LaunchFile}";
 
                             // set a default name
                             var executableName = Path.GetFileNameWithoutExtension(executableFullPath);
 
-                            var icon = $@"{oculusBasePath}\..\CoreData\Software\StoreAssets\{manifest.CanonicalName}_assets\icon_image.jpg";
+                            var icon = $@"{currentLibraryBasePath}\..\CoreData\Software\StoreAssets\{manifest.CanonicalName}_assets\icon_image.jpg";
 
                             if (!File.Exists(icon))
                             {
                                 logger.Debug($"Oculus store icon missing from file system- reverting to executable icon");
                                 icon = executableFullPath;
                             }
 
-                            var backgroundImage = $@"{oculusBasePath}\..\CoreData\Software\StoreAssets\{manifest.CanonicalName}_assets\cover_landscape_image_large.png";
+                            var backgroundImage = $@"{currentLibraryBasePath}\..\CoreData\Software\StoreAssets\{manifest.CanonicalName}_assets\cover_landscape_image_large.png";
 
                             if (!File.Exists(backgroundImage))
                             {
@@ -92,6 +93,7 @@ public override IEnumerable<GameInfo> GetGames()
                                 Name = scrapedData?.Name ?? executableName,
                                 Description = scrapedData?.Description ?? string.Empty,
                                 GameId = manifest.AppId,
+                                InstallDirectory = installationPath,
                                 PlayAction = new GameAction
                                 {
                                     Type = GameActionType.File,
@@ -142,21 +144,8 @@ private List<OculusManifest> GetOculusAppManifests(string oculusBasePath)
                     }
 
                     var json = File.ReadAllText(fileName);
-
-                    if (string.IsNullOrWhiteSpace(json))
-                    {
-                        logger.Error($"JSON file is empty ({fileName})");
-                        continue;
-                    }
-
-                    var manifest = JsonConvert.DeserializeObject<OculusManifest>(json);
-
-                    if (manifest == null)
-                    {
-                        logger.Error($"Could not deserialise json ({fileName})");
-                    }
-
-                    manifest.LaunchFile = manifest?.LaunchFile?.Replace("/", @"\");
+
+                    var manifest = OculusManifest.Parse(json);
 
                     manifests.Add(manifest);
                 }

diff --git a/OculusLibrary/OculusManifest.cs b/OculusLibrary/OculusManifest.cs
@@ -1,10 +1,32 @@
-namespace OculusLibrary
+using Newtonsoft.Json;
+using System;
+
+namespace OculusLibrary
 {
     internal class OculusManifest
     {
         public string AppId { get; set; }
         public string LaunchFile { get; set; }
         public string LaunchParameters { get; set; }
         public string CanonicalName { get; set; }
+
+        public static OculusManifest Parse(string json)
+        {
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                throw new ArgumentException("JSON string cannot be null and empty");
+            }
+
+            var manifest = JsonConvert.DeserializeObject<OculusManifest>(json);
+
+            if (manifest == null)
+            {
+                throw new ManifestParseException("Could not deserialise json");
+            }
+
+            manifest.LaunchFile = manifest?.LaunchFile?.Replace("/", @"\");
+
+            return manifest;
+        }
     }
 }