Updated publish configurations, fixed team scrolling, fixed event pag…

…e null reference
MatrikMoon · Jan 25, 2021 · d91f98e · d91f98e
1 parent 84fabb3
commit d91f98e
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 3 deletions.
diff --git a/TournamentAssistant/UI/FlowCoordinators/EventSelectionCoordinator.cs b/TournamentAssistant/UI/FlowCoordinators/EventSelectionCoordinator.cs
@@ -61,7 +61,7 @@ private void UpdateScrapeCount(int count, int total)
 
         private void itemSelection_ItemSelected(ListItem item)
         {
-            var eventHostPair = ScrapedInfo.First(x => x.Value.Events.Any(y => $"{y.EventId}" == item.Identifier));
+            var eventHostPair = ScrapedInfo.Where(x => x.Value.Events != null).First(x => x.Value.Events.Any(y => $"{y.EventId}" == item.Identifier));
             _qualifierCoordinator = BeatSaberUI.CreateFlowCoordinator<QualifierCoordinator>();
             _qualifierCoordinator.DidFinishEvent += qualifierCoordinator_DidFinishEvent;
             _qualifierCoordinator.Event = eventHostPair.Value.Events.First(x => $"{x.EventId}" == item.Identifier);

diff --git a/TournamentAssistant/UI/ViewControllers/TeamSelection.cs b/TournamentAssistant/UI/ViewControllers/TeamSelection.cs
@@ -53,5 +53,11 @@ private void TeamClicked(TableView sender, TeamListItem teamListItem)
         {
             TeamSelected?.Invoke(teamListItem.team);
         }
+
+        [UIAction("#post-parse")]
+        private void PostParse()
+        {
+            teamList?.tableView.ReloadData();
+        }
     }
 }
diff --git a/TournamentAssistantCore/Properties/PublishProfiles/Linux.pubxml b/TournamentAssistantCore/Properties/PublishProfiles/Linux.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\publish\linux\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishTrimmed>False</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/TournamentAssistantCore/Properties/PublishProfiles/Linux.pubxml.user b/TournamentAssistantCore/Properties/PublishProfiles/Linux.pubxml.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/TournamentAssistantCore/Properties/PublishProfiles/Windows.pubxml b/TournamentAssistantCore/Properties/PublishProfiles/Windows.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\publish\windows\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>False</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/TournamentAssistantCore/Properties/PublishProfiles/Windows.pubxml.user b/TournamentAssistantCore/Properties/PublishProfiles/Windows.pubxml.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/TournamentAssistantCore/TournamentAssistantCore.csproj b/TournamentAssistantCore/TournamentAssistantCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk;Microsoft.NET.Sdk.Publish">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/TournamentAssistantUI/UI/MatchPage.xaml.cs b/TournamentAssistantUI/UI/MatchPage.xaml.cs
@@ -241,7 +241,9 @@ private void Connection_MatchDeleted(Match deletedMatch)
         private void LoadSong_Executed(object obj)
         {
             SongLoading = true;
-            var songId = GetSongIdFromUrl(SongUrlBox.Text) ?? OstHelper.allLevels.First(x => x.Value == SongUrlBox.Text).Key;
+
+            //TODO: This got swapped around backwards somehow
+            var songId = OstHelper.allLevels.FirstOrDefault(x => x.Value == SongUrlBox.Text).Key ?? GetSongIdFromUrl(SongUrlBox.Text);
 
             //var customHost = string.IsNullOrWhiteSpace(CustomSongHostBox.Text) ? null : CustomSongHostBox.Text;
             string customHost = null;