diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 65dfb5e..187836a 100644 Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide index e1bb9c0..ece0f40 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index e469e8c..e6c4c62 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index 49366fd..d520374 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index a167154..48cd56a 100644 --- a/Crunchyroll Downloader/Anime_Add.Designer.vb +++ b/Crunchyroll Downloader/Anime_Add.Designer.vb @@ -273,9 +273,9 @@ Partial Class Anime_Add Me.ClientSize = New System.Drawing.Size(630, 275) Me.Controls.Add(Me.pictureBox3) Me.Controls.Add(Me.pictureBox4) + Me.Controls.Add(Me.groupBox2) Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.GroupBox3) - Me.Controls.Add(Me.groupBox2) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "Anime_Add" Me.Text = "Add" diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index c3254d5..273859a 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -766,7 +766,16 @@ Public Class Anime_Add TargetReso = 1080 End If - If ComboBox1.Enabled = False Then + If ComboBox1.Text = "Dub" Then + For i As Integer = 0 To AoD_DubList.Count - 1 + ProcessList.Add(AoD_DubList(i)) + Next + + ElseIf ComboBox1.Text = "OmU" Then + For i As Integer = 0 To AoD_OmUList.Count - 1 + ProcessList.Add(AoD_OmUList(i)) + Next + ElseIf ComboBox1.Enabled = False Then If AoD_DubList.Count > 0 Then For i As Integer = 0 To AoD_DubList.Count - 1 @@ -782,15 +791,6 @@ Public Class Anime_Add SubExit = True End If - ElseIf ComboBox1.Text = "Dub" Then - For i As Integer = 0 To AoD_DubList.Count - 1 - ProcessList.Add(AoD_DubList(i)) - Next - - ElseIf ComboBox1.Text = "OmU" Then - For i As Integer = 0 To AoD_OmuList.Count - 1 - ProcessList.Add(AoD_OmuList(i)) - Next Else MsgBox("error 2") SubExit = True @@ -999,7 +999,11 @@ Public Class Anime_Add Dim client As New WebClient client.Encoding = System.Text.Encoding.UTF8 Dim text As String = client.DownloadString(m3u8_Master_url) - + 'Me.Invoke(New Action(Function() + ' MsgBox(m3u8_Master_url) + ' Return Nothing + ' End Function)) + 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\Test.txt", text, False) If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments Dim new_m3u8() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 6083a7a..2c7af52 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1369,7 +1369,7 @@ Public Class Main End If Pfad2 = Chr(34) + Pfad2 + "\" + CR_FilenName + ".mp4" + Chr(34) - + Pfad2 = Pfad2.Replace("\\", "\") #End Region #Region "Subs" Dim SoftSubs2 As New List(Of String) @@ -2108,6 +2108,7 @@ Public Class Main Dim DefaultPath As String = Pfad + "\" + DefaultName + ".mp4" + DefaultPath = DefaultPath.Replace("\\", "\") #End Region #Region "Pfad" @@ -2746,7 +2747,7 @@ Public Class Main bytes = clientSocket.Receive(recvBytes, 0, clientSocket.Available, SocketFlags.None) htmlReq = Encoding.UTF8.GetString(recvBytes, 0, bytes) 'MsgBox(htmlReq) - My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\log.txt", htmlReq + vbNewLine, True) + 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\log.txt", htmlReq + vbNewLine, True) Dim rootPath As String = Directory.GetCurrentDirectory() & "\WebInterface\" ' Set default page Dim defaultPage As String = "index.html" diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index dc4c92c..59abd86 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb index cc47f20..4c2fad2 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html index 2a878fe..00ce397 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html +++ b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html @@ -27,37 +27,9 @@ .liClass{margin-bottom:8px}
-Status: 1 / 1 +Crunchyroll Downloader -