Fixed issues with path seperators when server is running under linux;…

… Client code audio rest would crash app
TWhidden · Sep 25, 2018 · 8a813c1 · 8a813c1
1 parent 54d980b
commit 8a813c1
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 25 deletions.
diff --git a/Docker/Client/entrypoint.sh b/Docker/Client/entrypoint.sh
@@ -11,4 +11,7 @@ echo "STARTING HOLIDAY SHOW CLIENT CORE..."
 # reference: https://www.raspberrypi.org/documentation/configuration/audio-config.md
 amixer cset numid=3 1
 
+# set the volume level of the PCM device to 100%
+amixer set PCM 100%
+
 ./HolidayShowClient.Core -s "$SERVER" -p $PORT -d $DEVICEID -a "$STORAGE"
diff --git a/HolidayShowEditor/ViewModels/AudioFilesViewModel.cs b/HolidayShowEditor/ViewModels/AudioFilesViewModel.cs
@@ -108,7 +108,7 @@ private async void OnCommandScanDirectory()
                         double nanoseconds;
                         double.TryParse(so.Properties.System.Media.Duration.Value.ToString(),
                         out nanoseconds);
-                        Console.WriteLine(@"NanaoSeconds: {0}", nanoseconds);
+                        Console.WriteLine(@"NanoSeconds: {0}", nanoseconds);
                         if (nanoseconds > 0)
                         {
                             int milliseconds = (int)Convert100NanosecondsToMilliseconds(nanoseconds) ;

diff --git a/HolidayShowEndpointUniversalApp/Controllers/AudioInstanceController.cs b/HolidayShowEndpointUniversalApp/Controllers/AudioInstanceController.cs
@@ -58,13 +58,12 @@ public void SetMediaElement(MediaElement mediaElement)
 
         public async void StopPlayback()
         {
-            Console.WriteLine($"StopPlayback() called for {_currentRequest.FileName}");
-
 #if CORE
             _externalPlayerProcess?.Close();
             _externalPlayerProcess?.Dispose();
 
 #else
+            Console.WriteLine($"StopPlayback() called for {_currentRequest.FileName}");
             await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
                 () =>
                 {

diff --git a/HolidayShowServer.Core/HolidayShowServer.Core.csproj b/HolidayShowServer.Core/HolidayShowServer.Core.csproj
@@ -6,10 +6,10 @@
     <Authors>Travis Whidden</Authors>
     <Company>None</Company>
     <AssemblyName>holidayshowserver.core</AssemblyName>
-    <AssemblyVersion>2.18.0917.0</AssemblyVersion>
-    <FileVersion>2.18.0917.0</FileVersion>
+    <AssemblyVersion>2.18.0924.0</AssemblyVersion>
+    <FileVersion>2.18.0924.0</FileVersion>
     <Configurations>Debug;Release;ReleaseCore</Configurations>
-    <Version>2.18.0917</Version>
+    <Version>2.18.0924</Version>
     <PackageReleaseNotes>Reduced Database calls to reduce CPU. Code cleanup</PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/HolidayShowServer/Program.cs b/HolidayShowServer/Program.cs
@@ -150,7 +150,7 @@ private static void ConfigureServices(IServiceCollection services)
         }
 #endif
 
-        static void LogMessage(string message, bool persistMessage = false)
+        public static void LogMessage(string message, bool persistMessage = false)
         {
             lock (LogMessages)
             {

diff --git a/HolidayShowServer/RemoteClient.cs b/HolidayShowServer/RemoteClient.cs
@@ -261,23 +261,28 @@ public override async void ProcessPacket(byte[] bytes, ParserProtocolContainer p
                     using (var dc = new EfHolidayContext(Program.ConnectionString))
                     {
                         var basePathSetting = await dc.Settings.Where(x=> x.SettingName == SettingKeys.FileBasePath).FirstOrDefaultAsync();
-                        if (basePathSetting == null || String.IsNullOrWhiteSpace(basePathSetting.ValueString) || !Directory.Exists(basePathSetting.ValueString))
+                        if (basePathSetting == null || string.IsNullOrWhiteSpace(basePathSetting.ValueString) || !Directory.Exists(basePathSetting.ValueString))
                         {
-                            Console.WriteLine("System Setting {0} does not exist in settings table. Must be set to support file transfers", SettingKeys.FileBasePath);
+                            Program.LogMessage($"System Setting {SettingKeys.FileBasePath} does not exist in settings table. Must be set to support file transfers");
                             BeginSend(new ProtocolMessage(MessageTypeIdEnum.RequestFailed));
                             return;
                         }
 
                         var fileRequested = message.MessageParts[ProtocolMessage.FILEDOWNLOAD];
 
-                        Console.WriteLine("File Requested {0}", fileRequested);
+                        Program.LogMessage($"File Requested {fileRequested}");
 
-                        var combinedPath = Path.Combine(basePathSetting.ValueString, fileRequested);
+                        var fileRequestedModified = fileRequested.Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
+
+                        Program.LogMessage($"Modified File Requested {fileRequestedModified}");
+
+                        // Modify the path separators based on if the server is in linux or windows.
+                        var combinedPath = Path.Combine(basePathSetting.ValueString, fileRequestedModified);
 
                         // See if the requested file exists
                         if (!File.Exists(combinedPath))
                         {
-                            Console.WriteLine("File Requsted does not exist at path {0}", combinedPath);
+                            Program.LogMessage($"File Requested does not exist at path {combinedPath}");
                             BeginSend(new ProtocolMessage(MessageTypeIdEnum.RequestFailed));
                             return;
                         }

diff --git a/docker-compose-client.override.yml b/docker-compose-client.override.yml
diff --git a/docker-compose-client.yml b/docker-compose-client.yml
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
@@ -20,10 +20,6 @@
     <ProjectGuid>9cba41e6-bd68-4687-be20-a41d0f231f7d</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="docker-compose-client.override.yml">
-      <DependentUpon>docker-compose-client.yml</DependentUpon>
-    </None>
-    <None Include="docker-compose-client.yml" />
     <None Include=".dockerignore" />
     <None Include="docker-compose.yml" />
   </ItemGroup>