minor fixes

MareSynchronos/Managers/CachedPlayer.cs

@@ -221,8 +221,7 @@ public class CachedPlayer
     private void ApplyBaseData(Dictionary<string, string> moddedPaths)
     {
         _ipcManager.PenumbraRemoveTemporaryCollection(PlayerName!);
-        var tempCollection = _ipcManager.PenumbraCreateTemporaryCollection(PlayerName!);
+        _ipcManager.PenumbraSetTemporaryMods(PlayerName!, moddedPaths, _cachedData.ManipulationData);
-        _ipcManager.PenumbraSetTemporaryMods(tempCollection, moddedPaths, _cachedData.ManipulationData);
     }
 
     private unsafe void ApplyCustomizationData(ObjectKind objectKind)

MareSynchronos/Managers/IpcManager.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using Dalamud.Game.ClientState.Objects.Types;
 using MareSynchronos.Utils;
 using MareSynchronos.WebAPI;
+using Lumina.Excel.GeneratedSheets;
+using Action = System.Action;
 
 namespace MareSynchronos.Managers
 {
@@ -227,16 +229,20 @@ namespace MareSynchronos.Managers
             return resolvedPaths;
         }
 
-        public void PenumbraSetTemporaryMods(string collectionName, Dictionary<string, string> modPaths, string manipulationData)
+        public void PenumbraSetTemporaryMods(string characterName, Dictionary<string, string> modPaths, string manipulationData)
         {
             if (!CheckPenumbraApi()) return;
 
-            Logger.Verbose("Assigning temp mods for " + collectionName);
+            actionQueue.Enqueue(() =>
-            foreach (var mod in modPaths)
             {
-                Logger.Verbose(mod.Key + " => " + mod.Value);
+                var ret = _penumbraCreateTemporaryCollection.InvokeFunc("MareSynchronos", characterName, true);
-            }
+                Logger.Verbose("Assigning temp mods for " + ret.Item2);
-            var ret = _penumbraSetTemporaryMod.InvokeFunc("MareSynchronos", collectionName, modPaths, manipulationData, 0);
+                foreach (var mod in modPaths)
+                {
+                    Logger.Verbose(mod.Key + " => " + mod.Value);
+                }
+                _penumbraSetTemporaryMod.InvokeFunc("MareSynchronos", ret.Item2, modPaths, manipulationData, 0);
+            });
         }
 
         private void RedrawEvent(IntPtr objectAddress, int objectTableIndex)

MareSynchronos/MareSynchronos.csproj

@@ -32,6 +32,10 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.8" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyy-MM-ddTHH:mm:ss:fffZ"))</SourceRevisionId>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj" />
     <ProjectReference Include="..\Penumbra\Penumbra.GameData\Penumbra.GameData.csproj" />

MareSynchronos/UI/CompactUI.cs

@@ -36,7 +36,18 @@ namespace MareSynchronos.UI
         public CompactUi(WindowSystem windowSystem,
             UiShared uiShared, Configuration configuration, ApiController apiController)
 #if DEBUG
-            : base("Mare Synchronos " + new FileInfo(Assembly.GetExecutingAssembly().Location) .LastWriteTime.ToString("yyyyMMddHHmmss")+ "###MareSynchronosMainUI")
+            string dateTime = "DEV VERSION";
+            try
+            {
+                dateTime = VariousExtensions.GetLinkerTime(Assembly.GetCallingAssembly()).ToString("yyyyMMddHHmmss");
+            }
+            catch (Exception ex)
+            {
+                Logger.Warn("Could not get assembly name");
+                Logger.Warn(ex.Message);
+                Logger.Warn(ex.StackTrace);
+            }
+            this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI";
 #else
             : base("Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version + "###MareSynchronosMainUI")
 #endif

MareSynchronos/UI/DownloadUi.cs

@@ -101,7 +101,7 @@ public class DownloadUi : Window, IDisposable
 
         if (_apiController.CurrentDownloads.Any())
         {
-            var currentDownloads = _apiController.CurrentDownloads.SelectMany(k => k.Value).ToList();
+            var currentDownloads = _apiController.CurrentDownloads.Where(d => d.Value != null && d.Value.Any()).ToList().SelectMany(k => k.Value).ToList();
             var multBase = currentDownloads.Any() ? 0 : 2;
             var doneDownloads = currentDownloads.Count(c => c.IsTransferred);
             var totalDownloads = currentDownloads.Count;

MareSynchronos/Utils/Various.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MareSynchronos.Utils
+{
+    public static class VariousExtensions
+    {
+        public static DateTime GetLinkerTime(Assembly assembly)
+        {
+            const string BuildVersionMetadataPrefix = "+build";
+
+            var attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            if (attribute?.InformationalVersion != null)
+            {
+                var value = attribute.InformationalVersion;
+                var index = value.IndexOf(BuildVersionMetadataPrefix);
+                if (index > 0)
+                {
+                    value = value[(index + BuildVersionMetadataPrefix.Length)..];
+                    return DateTime.ParseExact(value, "yyyy-MM-ddTHH:mm:ss:fffZ", CultureInfo.InvariantCulture);
+                }
+            }
+
+            return default;
+        }
+    }
+}