From 3a99c3bb304e1f9f4830ae7c84fd9594f3fd8c85 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 7 Mar 2019 16:31:56 -0700 Subject: [PATCH] Adds PrefixDictionaryFolderItems method to add "[+] " prefix to folder names for MC. --- .../Messengers/VideoCodecBaseMessenger.cs | 45 ++++++++++++++++++- .../VC/EssentialsVideoCodecUiDriver.cs | 1 - essentials-framework | 2 +- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs b/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs index eb56c01e..b8ca2dac 100644 --- a/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs +++ b/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs @@ -87,11 +87,13 @@ namespace PepperDash.Essentials.AppServer.Messengers if (dirCodec != null) { + var prefixedDirectoryResults = PrefixDirectoryFolderItems(directory); + var directoryMessage = new { currentDirectory = new { - directoryResults = directory.CurrentDirectoryResults, + directoryResults = prefixedDirectoryResults, isRootDirectory = isRoot } }; @@ -99,6 +101,47 @@ namespace PepperDash.Essentials.AppServer.Messengers } } + /// + /// Iterates a directory object and prefixes any folder items with "[+] " + /// + /// + /// + List PrefixDirectoryFolderItems (CodecDirectory directory) + { + var tempDirectoryList = new List(); + + if (directory.CurrentDirectoryResults.Count > 0) + { + foreach (var item in directory.CurrentDirectoryResults) + { + if (item is DirectoryFolder) + { + var newFolder = new DirectoryFolder(); + + newFolder = (DirectoryFolder)item.Clone(); + + string prefixName = "[+] " + newFolder.Name; + + newFolder.Name = prefixName; + + tempDirectoryList.Add(newFolder); + } + else + { + tempDirectoryList.Add(item); + } + } + } + //else + //{ + // DirectoryItem noResults = new DirectoryItem() { Name = "No Results Found" }; + + // tempDirectoryList.Add(noResults); + //} + + return tempDirectoryList; + } + /// /// /// diff --git a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs index c9a2ae12..15f90ff4 100644 --- a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs +++ b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs @@ -549,7 +549,6 @@ namespace PepperDash.Essentials.UIDrivers.VC { (Codec as IHasDirectory).SetCurrentDirectoryToRoot(); -#warning Deal with this recursive issue SearchKeypadClear(); RefreshDirectory(); diff --git a/essentials-framework b/essentials-framework index 3e7dbeb1..713be9a7 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 3e7dbeb111513cfed55db5012375bec1de7239a1 +Subproject commit 713be9a794efcb48043ed784b214f11cf21e145c