From b0920746d182f241d74c62c80d519af35c4cc4b7 Mon Sep 17 00:00:00 2001
From: Andrew Welker <awelker@peppedash.com>
Date: Thu, 3 Apr 2025 17:54:22 -0500
Subject: [PATCH] feat: check base folder for cplz and ir files

In an effort to make things easier for devs and end users, the plugin loading logic will now find .cplz files that are in the `Global.FilePathPrefix` base folder (/user/program{programNumber}/` on an appliance, `/user/` on a server). The same applies for IR files. This should make it so that individual plugin cplzs can be loaded via the VC-4 web interface.
---
 .../Devices/IrOutputPortController.cs         | 23 ++++++++++++++++-
 .../Plugins/PluginLoader.cs                   | 25 +++++++++++++------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs b/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs
index 45c2d895..edcedfbb 100644
--- a/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs
+++ b/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs
@@ -12,6 +12,8 @@ using PepperDash.Essentials.Core.Config;
 
 using PepperDash.Core;
 using Serilog.Events;
+using System.IO;
+using PepperDash.Core.Logging;
 
 namespace PepperDash.Essentials.Core
 {
@@ -69,7 +71,26 @@ namespace PepperDash.Essentials.Core
                     return;
                 }
                 
-                var filePath = Global.FilePathPrefix + "ir" + Global.DirectorySeparator + config.Properties["control"]["irFile"].Value<string>();
+                // var filePath = Global.FilePathPrefix + "ir" + Global.DirectorySeparator + config.Properties["control"]["irFile"].Value<string>();
+
+                var fileName = config.Properties["control"]["irFile"].Value<string>();
+
+                var files = Directory.GetFiles(Global.FilePathPrefix, fileName, SearchOption.AllDirectories);
+
+                if(files.Length == 0)
+                {
+                    this.LogError("IR file {fileName} not found in {path}", fileName, Global.FilePathPrefix);
+                    return;
+                }
+
+                if(files.Length > 1)
+                {
+                    this.LogError("IR file {fileName} found in multiple locations: {files}", fileName, files);
+                    return;
+                }
+
+                var filePath = files[0];
+
                 Debug.LogMessage(LogEventLevel.Debug, "*************Attempting to load IR file: {0}***************", filePath);
 
                 LoadDriver(filePath);
diff --git a/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs b/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs
index 4759b2cd..3de08806 100644
--- a/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs
+++ b/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs
@@ -2,13 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
+// using Crestron.SimplSharp.CrestronIO;
 using System.Reflection;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using Serilog.Events;
 using Newtonsoft.Json;
+using System.IO;
 
 namespace PepperDash.Essentials
 {
@@ -283,11 +284,21 @@ namespace PepperDash.Essentials
         /// </summary>
         static void UnzipAndMoveCplzArchives()
         {
-            Debug.LogMessage(LogEventLevel.Information, "Looking for .cplz archives from plugins folder...");
-            var di = new DirectoryInfo(_pluginDirectory);
-            var zFiles = di.GetFiles("*.cplz");
+            Debug.LogMessage(LogEventLevel.Information, "Looking for .cplz archives from user folder...");
+            //var di = new DirectoryInfo(_pluginDirectory);
+            //var zFiles = di.GetFiles("*.cplz");
 
-            if (zFiles.Length > 0)
+            //// Find cplz files at the root of the user folder. Makes development/testing easier for VC-4, and helps with mistakes by end users
+
+            //var userDi = new DirectoryInfo(Global.FilePathPrefix);
+            //var userZFiles = userDi.GetFiles("*.cplz");
+
+            Debug.LogInformation("Checking {folder} for .cplz files", Global.FilePathPrefix);
+            var cplzFiles = Directory.GetFiles(Global.FilePathPrefix, "*.cplz", SearchOption.AllDirectories)
+                .Select(f => new FileInfo(f))
+                .ToArray();
+
+            if (cplzFiles.Length > 0)
             {
                 if (!Directory.Exists(_loadedPluginsDirectoryPath))
                 {
@@ -295,12 +306,12 @@ namespace PepperDash.Essentials
                 }
             }
 
-            foreach (var zfi in zFiles)
+            foreach (var zfi in cplzFiles)
             {
                 Directory.CreateDirectory(_tempDirectory);
                 var tempDi = new DirectoryInfo(_tempDirectory);
 
-                Debug.LogMessage(LogEventLevel.Information, "Found cplz: {0}. Unzipping into temp plugins directory", zfi.Name);
+                Debug.LogMessage(LogEventLevel.Information, "Found cplz: {0}. Unzipping into temp plugins directory", zfi.FullName);
                 var result = CrestronZIP.Unzip(zfi.FullName, tempDi.FullName);
                 Debug.LogMessage(LogEventLevel.Information, "UnZip Result: {0}", result.ToString());