updating logger

Geektoolkit · Geektoolkit · commit d7ccbc58b81b · 2021-04-01T01:22:08.000-07:00
diff --git a/Dynaframe3.csproj b/Dynaframe3.csproj
@@ -1,14 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Dynaframe</AssemblyName>
     <Version>2.19</Version>
     <Authors>Joe Farro</Authors>
     <Company>Geektoolkit</Company>
     <Product>Dynaframe</Product>
     <Description>Dynaframe is a dynamic photo application which can show images and videos as slideshows. It features a web frontend, home automation integration, and more.</Description>
-    <AssemblyVersion>2.1009.0.0</AssemblyVersion>
+    <AssemblyVersion>2.19.0.0</AssemblyVersion>
     <Configurations>Release;Debug</Configurations>
     <FileVersion>2.19.0.0</FileVersion>
   </PropertyGroup>
diff --git a/Logger.cs b/Logger.cs
@@ -42,9 +42,9 @@ public static string GetLogAsHTML()
             }
 
             string returnVal = "";
-            foreach (string str in memoryLog)
+            for(int i = memoryLog.Count -1; i > 0; i--)
             {
-                returnVal += str + "\r\n";
+                returnVal += memoryLog[i] + "\r\n";
             }
             return returnVal;
         }
diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
@@ -630,16 +630,17 @@ private void KillVideoPlayer()
                     catch (Exception exc)
                     {
                         Debug.WriteLine("Tried and failed to kill video process..." + exc.ToString());
-                        Logger.LogComment("Tried and failed to kill video process. Excpetion: " + exc.ToString());
+                        Logger.LogComment("Tried and failed to kill video process. Exception: " + exc.ToString());
                     }
                 }
 
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     // OMXPlayer processes can be a bit tricky. to kill them we use
                     // killall - 9 omxplayer.bin
+                    // -q quiets this down in case omxplayer isn't running
 
-                    Helpers.RunProcess("killall", "-9 omxplayer.bin");
+                    Helpers.RunProcess("killall", "-q -9 omxplayer.bin");
                     videoProcess = null;
 
                 }
diff --git a/PlayListEngine.cs b/PlayListEngine.cs
@@ -119,6 +119,7 @@ public List<PlayListItem> GetPlayListItems()
             }
 
             Logger.LogComment("New List generated! Contains: " + CurrentPlayListItems.Count + " items. Shuffle setting is: " + AppSettings.Default.Shuffle);
+
             // extra logging for now 
             Logger.LogComment("----------------------Begin Playlist Dump----------------");
             try
diff --git a/install.sh b/install.sh
@@ -11,7 +11,7 @@ echo "Version is: $version"
 if [ -z "$1" ]
 then
   echo -e  "${CYAN}No version passed in...using default${NC}"
-  version="2.18"
+  version="2.19"
 fi
 
 
diff --git a/web/Log.htm b/web/Log.htm
@@ -1,9 +1,10 @@
 ﻿<html>
 <head>
+    <!--meta http-equiv="refresh" content="10"-->
 </head>
 <body>
     Debug log for version: <!--VERSIONSTRING--><br />
-    <textarea cols="120" rows="80" style="overflow:auto;">
+    <textarea cols="200" rows="160" style="overflow:auto;">
   <!--LOG-->
   </textarea>
 </body>

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ public static string GetLogAsHTML()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`string returnVal = "";`
`45`		`- foreach (string str in memoryLog)`
	`45`	`+ for(int i = memoryLog.Count -1; i > 0; i--)`
`46`	`46`	`{`
`47`		`- returnVal += str + "\r\n";`
	`47`	`+ returnVal += memoryLog[i] + "\r\n";`
`48`	`48`	`}`
`49`	`49`	`return returnVal;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -630,16 +630,17 @@ private void KillVideoPlayer()`
`630`	`630`	`catch (Exception exc)`
`631`	`631`	`{`
`632`	`632`	`Debug.WriteLine("Tried and failed to kill video process..." + exc.ToString());`
`633`		`- Logger.LogComment("Tried and failed to kill video process. Excpetion: " + exc.ToString());`
	`633`	`+ Logger.LogComment("Tried and failed to kill video process. Exception: " + exc.ToString());`
`634`	`634`	`}`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`638`	`638`	`{`
`639`	`639`	`// OMXPlayer processes can be a bit tricky. to kill them we use`
`640`	`640`	`// killall - 9 omxplayer.bin`
	`641`	`+ // -q quiets this down in case omxplayer isn't running`
`641`	`642`
`642`		`- Helpers.RunProcess("killall", "-9 omxplayer.bin");`
	`643`	`+ Helpers.RunProcess("killall", "-q -9 omxplayer.bin");`
`643`	`644`	`videoProcess = null;`
`644`	`645`
`645`	`646`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ public List<PlayListItem> GetPlayListItems()`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`Logger.LogComment("New List generated! Contains: " + CurrentPlayListItems.Count + " items. Shuffle setting is: " + AppSettings.Default.Shuffle);`
	`122`	`+`
`122`	`123`	`// extra logging for now`
`123`	`124`	`Logger.LogComment("----------------------Begin Playlist Dump----------------");`
`124`	`125`	`try`