Skip to content

Commit

Permalink
1.4.1 (#251)
Browse files Browse the repository at this point in the history
* recap & replay as default off the air games

- added recap feature for ended games
- replay set as default for live streams /w ended game (off the air)

closing issue #153

* 1.4 fix recap link when unavailable

* added proxy version to start

* 1.4.0

- added highlights
- re-added hosts support
- updated go-mlbam-proxy
- added hosts script go-mlbam-hosts
- fixed black screen issue when using the proxy and mpv player
- updated module spotify

close issue #243
close issue #153
close issue #237
close issue #228
close issue #229
close issue #233

* uri exception

close #248

* 1.4.1

- Even if NHLGames has no write access, it will now keep streaming instead of throwing "No player selected", but you better move the folder.
- Not showing series record for ended games if Scores is disabled
- Some others fixes
  • Loading branch information
jwallet committed Apr 22, 2019
1 parent 45f46e1 commit 21494ce
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions NHLGames/Controls/GameControl.vb
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Namespace Controls
Replace("wins", NHLGamesMetro.RmText.GetString("gameSeriesWin")).
Replace("leads", NHLGamesMetro.RmText.GetString("gameSeriesLead"))).
ToUpper(), seriesStatusShort)
Dim isSeriesRecordVisible = showSeriesRecord AndAlso _game.SeriesGameStatus.Length > 0 AndAlso (showScores OrElse Not _game.IsOffTheAir)
Dim isSeriesRecordVisible = showSeriesRecord AndAlso _game.SeriesGameStatus.Length > 0 AndAlso (showScores OrElse (_game.GameState < GameStateEnum.OffTheAir))
lblNotInSeason.Text = If(isSeriesRecordVisible, seriesStatusLong, seriesStatusShort)
End If

Expand Down Expand Up @@ -378,7 +378,7 @@ Namespace Controls
End Sub

Private Function WatchArgs() As GameWatchArguments
Return ApplicationSettings.Read(Of GameWatchArguments)(SettingsEnum.DefaultWatchArgs, New GameWatchArguments)
Return ApplicationSettings.Read(Of GameWatchArguments)(SettingsEnum.DefaultWatchArgs, NHLGamesMetro.watchArgs)
End Function

Private Sub WatchStream(streamType As StreamerTypeEnum)
Expand Down
1 change: 1 addition & 0 deletions NHLGames/NHLGamesMetro.vb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Public Class NHLGamesMetro
Public Shared IsServerUp As Boolean = Nothing
Public IsProxyListening As Task(Of Boolean) = Nothing
Public Shared IsHostsRedirectionSet As Boolean = False
Public Shared WatchArgs As GameWatchArguments = New GameWatchArguments

<SecurityPermission(SecurityAction.Demand, Flags:=SecurityPermissionFlag.ControlAppDomain)>
Public Shared Sub Main()
Expand Down
3 changes: 2 additions & 1 deletion NHLGames/Utilities/Common.vb
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ Namespace Utilities
Await GitHub.GetVersion()
Await GitHub.GetAccouncement()

NHLGamesMetro.IsServerUp = Await SendWebRequestAsync($"http://{NHLGamesMetro.HostName}")
Dim hostName As String = NHLGamesMetro.HostName
NHLGamesMetro.IsServerUp = If(Not hostName.Equals(String.Empty), Await SendWebRequestAsync($"http://{hostName}"), False)

If Not errorMessage.Equals(String.Empty) Then
FatalError(NHLGamesMetro.RmText.GetString(errorMessage))
Expand Down
2 changes: 1 addition & 1 deletion NHLGames/Utilities/InitializeForm.vb
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Namespace Utilities
PopulateComboBox(Form.cbServers, SettingsEnum.SelectedServer, SettingsEnum.ServerList, String.Empty)
Common.SetRedirectionServerInApp()

watchArgs = BindWatchArgsToForm(watchArgs)
NHLGamesMetro.WatchArgs = BindWatchArgsToForm(watchArgs)

Dim adDetectionConfigs = ApplicationSettings.Read(Of AdDetectionConfigs)(SettingsEnum.AdDetection, Nothing)

Expand Down
2 changes: 1 addition & 1 deletion NHLGames/Utilities/Proxy.vb
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Namespace Utilities
End Function

Private Sub SetPath()
_pathToProxy = $"{_folderPath}\{If(Environment.Is64BitOperatingSystem, "win64", "win86")}\{_exeName}"
_pathToProxy = $"{_folderPath}\{_exeName}"
End Sub

Public Function IsProxyFileFound() As Boolean
Expand Down
4 changes: 2 additions & 2 deletions NHLGames/res/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.4.0.0")>
<Assembly: AssemblyFileVersion("1.4.0.0")>
<Assembly: AssemblyVersion("1.4.1.0")>
<Assembly: AssemblyFileVersion("1.4.1.0")>
<Assembly: NeutralResourcesLanguage("en-CA")>

0 comments on commit 21494ce

Please sign in to comment.