Update, fix, improve

xTheEc0 · Jul 9, 2020 · 33b139c · 33b139c
1 parent 37b90f8
commit 33b139c
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 39 deletions.
diff --git a/SLAM/Form1.Designer.vb b/SLAM/Form1.Designer.vb
diff --git a/SLAM/Form1.vb b/SLAM/Form1.vb
@@ -316,16 +316,18 @@ Public Class Form1
                 trimmed = "Yes"
             End If
 
-            TrackList.Items.Add(New ListViewItem({"False", Track.name, Track.hotkey, Track.volume & "%", trimmed, """" & String.Join(""", """, Track.tags) & """"}))
+            Dim index As String = Game.tracks.IndexOf(Track) + 1 'for TrackIndexCol
+            TrackList.Items.Add(New ListViewItem({index, "False", Track.name, Track.hotkey, Track.volume & "%", trimmed, """" & String.Join(""", """, Track.tags) & """"}))
         Next
 
 
         TrackList.AutoResizeColumn(0, ColumnHeaderAutoResizeStyle.HeaderSize)
-        TrackList.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent)
-        TrackList.AutoResizeColumn(2, ColumnHeaderAutoResizeStyle.HeaderSize)
+        TrackList.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.HeaderSize)
+        TrackList.AutoResizeColumn(2, ColumnHeaderAutoResizeStyle.ColumnContent)
         TrackList.AutoResizeColumn(3, ColumnHeaderAutoResizeStyle.HeaderSize)
         TrackList.AutoResizeColumn(4, ColumnHeaderAutoResizeStyle.HeaderSize)
-        TrackList.AutoResizeColumn(5, ColumnHeaderAutoResizeStyle.ColumnContent)
+        TrackList.AutoResizeColumn(5, ColumnHeaderAutoResizeStyle.HeaderSize)
+        TrackList.AutoResizeColumn(6, ColumnHeaderAutoResizeStyle.ColumnContent)
     End Sub
 
     Private Sub StartButton_Click(sender As Object, e As EventArgs) Handles StartButton.Click
@@ -486,13 +488,13 @@ Public Class Form1
 
                     Dim GameCfgFolder As String = Path.Combine(SteamAppsPath, Game.directory, Game.ToCfg)
                     Using slam_curtrack As StreamWriter = New StreamWriter(GameCfgFolder & "slam_curtrack.cfg")
-                        slam_curtrack.WriteLine("echo ""[SLAM] Track name: {0}""", Track.name)
+                        slam_curtrack.WriteLine("echo ""Track name: {0}""", Track.name)
                     End Using
                     Using slam_saycurtrack As StreamWriter = New StreamWriter(GameCfgFolder & "slam_saycurtrack.cfg")
-                        slam_saycurtrack.WriteLine("say ""[SLAM] Track name: {0}""", Track.name)
+                        slam_saycurtrack.WriteLine("say ""Track name: {0}""", Track.name)
                     End Using
                     Using slam_sayteamcurtrack As StreamWriter = New StreamWriter(GameCfgFolder & "slam_sayteamcurtrack.cfg")
-                        slam_sayteamcurtrack.WriteLine("say_team ""[SLAM] Track name: {0}""", Track.name)
+                        slam_sayteamcurtrack.WriteLine("say_team ""Track name: {0}""", Track.name)
                     End Using
 
 
@@ -693,16 +695,12 @@ Public Class Form1
 
         Dim index As Integer
         For Each Track In Game.tracks
-            Dim Words As List(Of String) = Track.name.Split({" "c, "."c, "-"c, "_"c}).ToList
+            Dim Words As List(Of String) = Track.name.Split({" "c, "."c, "-"c, "_"c, "("c, ")"c, "!"c, "@"c, "#"c, "$"c, "^"c, "&"c, "*"c, "["c, "]"c}).ToList
 
             For Each Word In Words
 
-                If Not IsNumeric(Word) And Not Game.blacklist.Contains(Word.ToLower) And Word.Length < 32 Then
-                    If NameWords.ContainsKey(Word) Then
-                        NameWords.Remove(Word)
-                    Else
-                        NameWords.Add(Word, index)
-                    End If
+                If Not IsNumeric(Word) And Not Game.blacklist.Contains(Word.ToLower) And Word.Length < 32 And Not NameWords.ContainsKey(Word.ToLower) Then
+                    NameWords.Add(Word.ToLower, index)
                 End If
 
             Next
@@ -728,9 +726,9 @@ Public Class Form1
 
     Private Sub DisplayLoaded(ByVal track As Integer)
         For i As Integer = 0 To TrackList.Items.Count - 1
-            TrackList.Items(i).SubItems(0).Text = "False"
+            TrackList.Items(i).SubItems(1).Text = "False"
         Next
-        TrackList.Items(track).SubItems(0).Text = "True"
+        TrackList.Items(track).SubItems(1).Text = "True"
     End Sub
 
     Private Sub LoadTrackKeys(ByVal Game As SourceGame)
@@ -825,10 +823,10 @@ Public Class Form1
     End Sub
 
     Private Sub TrackList_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles TrackList.MouseDoubleClick
-        Const TRACK = 1
-        Const BIND = 2
-        Const VOLUME = 3
-        Const TRIMMED = 4
+        Const TRACK = 2
+        Const BIND = 3
+        Const VOLUME = 4
+        Const TRIMMED = 5
 
         If TrackList.FocusedItem.Bounds.Contains(e.Location) Then
 
@@ -868,7 +866,7 @@ Public Class Form1
 
         Dim SelectedNames As New List(Of String)
         For Each item In TrackList.SelectedItems
-            SelectedNames.Add(item.SubItems(1).Text)
+            SelectedNames.Add(item.SubItems(2).Text)
         Next
 
         If MessageBox.Show(String.Format("Are you sure you want to delete {0}?", String.Join(", ", SelectedNames)), "Delete Track?", MessageBoxButtons.YesNo) = Windows.Forms.DialogResult.Yes Then

diff --git a/SLAM/SLAM.vbproj b/SLAM/SLAM.vbproj
@@ -78,20 +78,23 @@
     <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libvideo">
-      <HintPath>lib\libvideo.dll</HintPath>
+    <Reference Include="libvideo, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VideoLibrary.3.0.2\lib\netstandard1.1\libvideo.dll</HintPath>
+    </Reference>
+    <Reference Include="libvideo.compat, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VideoLibrary.Compat.3.0.2\lib\netstandard1.1\libvideo.compat.dll</HintPath>
     </Reference>
     <Reference Include="NAudio">
       <HintPath>lib\NAudio.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>lib\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NReco.VideoConverter">
       <HintPath>lib\NReco.VideoConverter.dll</HintPath>

diff --git a/SLAM/SourceGame.vb b/SLAM/SourceGame.vb
@@ -15,7 +15,7 @@
     Public PollInterval As Integer = 100
 
     Public tracks As New List(Of Track)
-    Public blacklist As New List(Of String) From {"slam", "slam_listtracks", "list", "tracks", "la", "slam_play", "slam_play_on", "slam_play_off", "slam_updatecfg", "slam_curtrack", "slam_saycurtrack", "slam_sayteamcurtrack"}
+    Public blacklist As New List(Of String) From {"slam", "slam_listtracks", "list", "tracks", "la", "slam_play", "slam_play_on", "slam_play_off", "slam_updatecfg", "slam_curtrack", "slam_saycurtrack", "slam_sayteamcurtrack", "say"}
 
     Public Class track
         Public name As String

diff --git a/SLAM/YTImport.vb b/SLAM/YTImport.vb
@@ -54,7 +54,13 @@ Public Class YTImport
         Catch ex As Exception
             Form1.LogError(ex)
 
-            e.Result = ex
+            If ex.Message = "Sequence contains no elements" Then
+                Dim localEx = New Exception("Video possibly age restriced.")
+                e.Result = localEx
+            Else
+                e.Result = ex
+            End If
+
         End Try
     End Sub
 

diff --git a/SLAM/packages.config b/SLAM/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
-  <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.0-preview.4.20251.6" targetFramework="net45" />
+  <package id="NETStandard.Library" version="2.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
@@ -12,25 +13,25 @@
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
   <package id="System.Linq" version="4.3.0" targetFramework="net45" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
-  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
+  <package id="System.Net.Primitives" version="4.3.1" targetFramework="net45" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net45" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.1" targetFramework="net45" />
+  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net45" />
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net45" />
   <package id="System.Threading" version="4.3.0" targetFramework="net45" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net45" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
-  <package id="VideoLibrary" version="2.0.3" targetFramework="net45" />
-  <package id="VideoLibrary.Compat" version="2.0.3" targetFramework="net45" />
+  <package id="VideoLibrary" version="3.0.2" targetFramework="net45" />
+  <package id="VideoLibrary.Compat" version="3.0.2" targetFramework="net45" />
 </packages>