diff --git a/HitboxDashboard/HitboxDashboard.vbproj b/HitboxDashboard/HitboxDashboard.vbproj index 052815c..99e3247 100644 --- a/HitboxDashboard/HitboxDashboard.vbproj +++ b/HitboxDashboard/HitboxDashboard.vbproj @@ -75,6 +75,9 @@ My Project\app.manifest + + ..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll + False ..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/HitboxDashboard/MainWindow.Designer.vb b/HitboxDashboard/MainWindow.Designer.vb index 9a88780..6b7111f 100644 --- a/HitboxDashboard/MainWindow.Designer.vb +++ b/HitboxDashboard/MainWindow.Designer.vb @@ -289,7 +289,7 @@ Partial Class MainWindow Me.MaximizeBox = False Me.Name = "MainWindow" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide - Me.Text = "Dashbox 1.2.7" + Me.Text = "Dashbox 1.2.8" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/HitboxDashboard/MainWindow.vb b/HitboxDashboard/MainWindow.vb index ee211b5..25a86df 100644 --- a/HitboxDashboard/MainWindow.vb +++ b/HitboxDashboard/MainWindow.vb @@ -24,6 +24,8 @@ Imports System.Text Imports System.Security.Cryptography Imports System.Runtime.InteropServices Imports System.ComponentModel +'Imports Alchemy +'Imports Alchemy.Classes Public Class MainWindow @@ -42,7 +44,19 @@ Public Class MainWindow Dim sr As StreamReader = Nothing Dim AutoCompleteGame As New AutoCompleteStringCollection + + Public Sub MainWindow_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + 'Dim ChatSocket As New WebSocketClient("ws://54.204.156.212/socket.io/1/websocket/j26ULqsLWYoTIRtXXKMC") + + 'ChatSocket.Connect() + 'ChatSocket.Send("dada") + + 'While 1 + + 'End While + If Not File.Exists(inifile) Then Try Dim fs As FileStream @@ -632,4 +646,13 @@ Public Class MainWindow Private Sub TextBox_Password_MouseHover(sender As Object, e As EventArgs) Handles TextBox_Password.MouseHover ToolTip_Password.SetToolTip(TextBox_Password, "Type your Hitbox password here.") End Sub + + 'Private Function OnReceive(context As UserContext) As OnEventDelegate + ' Throw New NotImplementedException + 'End Function + + 'Private Function OnSend() As OnEventDelegate + ' Throw New NotImplementedException + 'End Function + End Class diff --git a/README.md b/README.md index be2c09d..3302235 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Dashbox +# Dashbox - No longer updated! Dashboard management tool for [Hitbox.tv](http://www.hitbox.tv) livestreams. Similar to eg. Twitch Dashboard Lite and other tools but for Hitbox.tv. diff --git a/Updater/Main.vb b/Updater/Main.vb index 8e3916a..210b517 100644 --- a/Updater/Main.vb +++ b/Updater/Main.vb @@ -35,7 +35,7 @@ Public Class Main If GblVars.updatedb.Contains("||") Then array = Split(GblVars.updatedb, "||") - dwnurl = array(0) + dwnurl = "https://832ac22bda8f93ababab398a8cd812b70a6eb164.googledrive.com/host/0BwXzp8oa9Tx4eU93R0xUNkFHa00/" For i As Integer = 1 To UBound(array) Step +1 @@ -44,14 +44,15 @@ Public Class Main Try File.Delete(path & array(i)) - Catch ex As IOException - MsgBox(array(i) & " is in use!") + Catch ex As Exception + MsgBox(array(i) & " is in use!" & vbCrLf & ex.ToString) End Try Try My.Computer.Network.DownloadFile(dwnurl & array(i), path & array(i), "", "", False, 3000, True) - Catch ex As WebException - MsgBox("Can't update " & array(i) & "! File might be read-only or in use!") + 'InputBox("", "", dwnurl) + Catch ex As Exception + MsgBox("Can't update " & array(i) & "! File might be read-only or in use!" & vbCrLf & ex.ToString) End Try Next End If @@ -76,10 +77,10 @@ Public Class Main End Class Public Class GblVars - Public Shared updatedb As String = DownloadString("https://googledrive.com/host/0BwXzp8oa9Tx4eU93R0xUNkFHa00/update.txt") + Public Shared updatedb As String = DownloadString("https://googledrive.com/host/0BwXzp8oa9Tx4eU93R0xUNkFHa00/update.txt").ToString Public Shared report As String - Shared Function DownloadString(ByVal address As String) + Shared Function DownloadString(ByVal address As String) As String Dim client As WebClient = New WebClient() Dim reply As String = client.DownloadString(address) Return reply diff --git a/Updater/My Project/app.manifest b/Updater/My Project/app.manifest index 74d8035..b2aba98 100644 --- a/Updater/My Project/app.manifest +++ b/Updater/My Project/app.manifest @@ -16,7 +16,7 @@ If you want to utilize File and Registry Virtualization for backward compatibility then delete the requestedExecutionLevel node. --> - + diff --git a/Updater/Updater.vbproj b/Updater/Updater.vbproj index 3d30702..cde2b51 100644 --- a/Updater/Updater.vbproj +++ b/Updater/Updater.vbproj @@ -22,7 +22,9 @@ true ..\HitboxDashboard\bin\Debug\ Updater.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 + + AnyCPU @@ -32,7 +34,9 @@ true ..\HitboxDashboard\bin\Release\ Updater.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 + + On