v1.7.2

9001 · Sep 22, 2020 · 58f255e · 58f255e
1 parent f31da0d
commit 58f255e
Show file tree

Hide file tree

Showing 8 changed files with 412 additions and 386 deletions.
diff --git a/Loopstream/LSSettings.cs b/Loopstream/LSSettings.cs
@@ -737,7 +737,7 @@ public void initFinally()
 
             if (triggers.Count == 0)
                 resetTriggers();
-
+            
             wavetailer.setFormat();
             LSSettings.singleton = this;
 
@@ -899,8 +899,8 @@ public void resetMetas()
                     "Traktor plugin  (does VirtualDJ too)",
                     "http://127.0.0.1:42069/statuls.xsl",
                     1000,
-                    "\\n<h42>( - )?([^\\n]*)</h42>\\n",
-                    "{2}",
+                    "\\n<h42>( - )?([^\\n<]*)\\n*([^\\n<]*)\\n*([^<]*)</h42>\\n",
+                    "{2}{3}{4}",
                     "utf-8",
                     true,
                     1,

diff --git a/Loopstream/Loopstream.csproj b/Loopstream/Loopstream.csproj
diff --git a/Loopstream/Properties/AssemblyInfo.cs b/Loopstream/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.2.0")]
+[assembly: AssemblyFileVersion("1.7.2.0")]
diff --git a/Loopstream/UI_Home.cs b/Loopstream/UI_Home.cs
@@ -1197,6 +1197,7 @@ void plowTheFields()
             wd = wd.Substring(0, wd.Replace('\\', '/').LastIndexOf('/') + 1);
             icebase = icebase.Substring(0, icebase.LastIndexOf('.')) + "Traktor";
             var ices = new string[] {
+                icebase + "3.exe",
                 icebase + "2.exe",
                 icebase + ".exe"
             };

diff --git a/LoopstreamTraktor/Form1.cs b/LoopstreamTraktor/Form1.cs
@@ -176,20 +176,31 @@ void t_Tick(object sender, EventArgs e)
             if (procs.Length > 0) Program.kill();
 
             string basedir = Program.tools + "ice";
-            if (Directory.Exists(basedir) && !File.Exists(Path.Combine(basedir, "web", "statuls.xsl")))
-                for (int a = 0; a < 3; a++)
-                    try
-                    {
-                        Directory.Delete(basedir, true);
-                        Application.DoEvents();
-                        System.Threading.Thread.Sleep(500); // mkdir fails otherwise, ok yes good
-                        break;
-                    }
-                    catch
-                    {
-                        Application.DoEvents();
-                        System.Threading.Thread.Sleep(250);
-                    }
+            if (Directory.Exists(basedir))
+            {
+                bool ok = false;
+                try
+                {
+                    var txt = File.ReadAllText(Path.Combine(basedir, "web", "statuls.xsl"), Encoding.UTF8);
+                    ok = txt.Contains("artist\" /> - </xsl:if><xsl");
+                }
+                catch { }
+
+                if (!ok)
+                    for (int a = 0; a < 3; a++)
+                        try
+                        {
+                            Directory.Delete(basedir, true);
+                            Application.DoEvents();
+                            System.Threading.Thread.Sleep(500); // mkdir fails otherwise, ok yes good
+                            break;
+                        }
+                        catch
+                        {
+                            Application.DoEvents();
+                            System.Threading.Thread.Sleep(250);
+                        }
+            }
 
             if (!Directory.Exists(basedir))
             {

diff --git a/LoopstreamTraktor/LoopstreamTraktor.csproj b/LoopstreamTraktor/LoopstreamTraktor.csproj
@@ -114,6 +114,16 @@
     <Content Include="ice_cube.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>LoopstreamTraktor.exe sign
+ping 127.0.0.1 -n 2 &gt;nul
+copy /Y LoopstreamTraktor.exe.exe c:\users\ed\bin\rls\LoopstreamTraktor3.exe
+</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/LoopstreamTraktor/Program.cs b/LoopstreamTraktor/Program.cs
@@ -53,4 +53,4 @@ public static void kill()
     }
 }
 
-// LoopstreamTraktor.exe sign && ping 127.0.0.1 -n 2 >nul && copy /Y LoopstreamTraktor.exe.exe c:\users\ed\bin\rls\LoopstreamTraktor2.exe
+// LoopstreamTraktor.exe sign && ping 127.0.0.1 -n 2 >nul && copy /Y LoopstreamTraktor.exe.exe c:\users\ed\bin\rls\LoopstreamTraktor3.exe
diff --git a/LoopstreamTraktor/tools/ice/web/statuls.xsl b/LoopstreamTraktor/tools/ice/web/statuls.xsl
@@ -5,12 +5,7 @@
 
 	<xsl:for-each select="source">
 <xsl:text>&#xa;</xsl:text>
-<h42>
-<xsl:if test="artist">
-<xsl:value-of select="artist" /> - 
-</xsl:if>
-<xsl:value-of select="title" />
-</h42>
+<h42><xsl:if test="artist"><xsl:value-of select="artist" /> - </xsl:if><xsl:value-of select="title" /></h42>
 <xsl:text>&#xa;</xsl:text>
 	</xsl:for-each>
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,4 +53,4 @@ public static void kill() @@
         }
     }
-    // LoopstreamTraktor.exe sign && ping 127.0.0.1 -n 2 >nul && copy /Y LoopstreamTraktor.exe.exe c:\users\ed\bin\rls\LoopstreamTraktor2.exe
+    // LoopstreamTraktor.exe sign && ping 127.0.0.1 -n 2 >nul && copy /Y LoopstreamTraktor.exe.exe c:\users\ed\bin\rls\LoopstreamTraktor3.exe