diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index b5654c3..e66956b 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 24f3202..968e7c8 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-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index 0a7fb5e..2a0ec47 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.vb b/Crunchyroll Downloader/Anime_Add.vb index 626882c..19e14bf 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -48,13 +48,6 @@ Public Class Anime_Add SubFolder_Value = Main.SubFolder_Nothing End Try - Try - Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") - Main.Pfad = rkg.GetValue("Ordner").ToString - TextBox4.Text = Main.Pfad - Catch ex As Exception - TextBox4.Text = Main.Pfad - End Try Try Dim di As New System.IO.DirectoryInfo(Main.Pfad) For Each fi As System.IO.DirectoryInfo In di.EnumerateDirectories("*.*", System.IO.SearchOption.TopDirectoryOnly) diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index dca65ac..c709c2a 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -142,7 +142,11 @@ Public Class GeckoFX ElseIf c = False Then If CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "hardsub_lang")) Then c = True + Main.WebbrowserURL = WebBrowser1.Url.ToString + Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml + Main.WebbrowserTitle = WebBrowser1.DocumentTitle SoftSub.DownloadSubs() + Me.Close() End If Else If Main.UserBowser = False Then diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 707be55..91721d5 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -134,6 +134,14 @@ Public Class Main Catch ex As Exception End Try + + Try + Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") + Pfad = rkg.GetValue("Ordner").ToString + Catch ex As Exception + + End Try + #Region "Startup IU" StatusToolTip.Active = True #End Region diff --git a/Crunchyroll Downloader/SoftSub.vb b/Crunchyroll Downloader/SoftSub.vb index fbe29ea..e060d86 100644 --- a/Crunchyroll Downloader/SoftSub.vb +++ b/Crunchyroll Downloader/SoftSub.vb @@ -184,7 +184,7 @@ Public Class SoftSub LocalSoftSubs.Add("esES") End If Catch ex As Exception - + MsgBox(ex.ToString) End Try If LocalSoftSubs.Count > 0 Then If CBool(InStr(textBox1.Text, "crunchyroll.com")) Then @@ -195,6 +195,7 @@ Public Class SoftSub End If Else 'Label2.Text = "Status: Error - nothing selected" + MsgBox("Error: no language selected", MsgBoxStyle.Information, "CRD Subtitel") PictureBox2.Visible = True End If End Sub @@ -212,14 +213,14 @@ Public Class SoftSub Dim CR_Anime_Folge As String 'Dim CR_Name_by_Titel As String() = GeckoFX.WebBrowser1.Document.Body.OuterHtml.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) 'Dim CR_Name_by_Titel_2_Patch As String =CR_Name_by_Titel(1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) - If CBool(InStr(GeckoFX.WebBrowser1.DocumentTitle, ":")) Then + If CBool(InStr(GeckoFX.WebBrowser1.DocumentTitle, "Anschauen auf Crunchyroll")) Then Bug_Deutsch = ":" 'Throw New System.Exception("Test") Else End If Dim CR_Name_by_Titel_2 As String() = Main.WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Name_by_Script As String() = Main.WebbrowserText.Split(New String() {Chr(34) + "name" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Name_by_Script2 As String() = CR_Name_by_Script(1).Split(New [Char]() {Chr(34)}) + 'Dim CR_Name_by_Script As String() = Main.WebbrowserText.Split(New String() {Chr(34) + "name" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + 'Dim CR_Name_by_Script2 As String() = CR_Name_by_Script(1).Split(New [Char]() {Chr(34)}) CR_FilenName = CR_Name_by_Titel_2(0).Trim() '+ " " + CR_Name_by_Script2(0).Trim Dim CR_FilenName_Backup As String = Nothing @@ -265,29 +266,15 @@ Public Class SoftSub End If CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ") CR_FilenName = Main.RemoveExtraSpaces(CR_FilenName) - If SubfolderValue = Nothing Then - Pfad2 = Main.Pfad + "\" + CR_FilenName + ".mp4" - Else - Pfad2 = Main.Pfad + "\" + SubfolderValue + CR_FilenName + ".mp4" - End If - If Not IO.Directory.Exists(Path.GetDirectoryName(Pfad2)) Then - ' Nein! Jetzt erstellen... - Try - IO.Directory.CreateDirectory(Path.GetDirectoryName(Pfad2)) - Catch ex As Exception - ' Ordner wurde nich erstellt - Pfad2 = Main.Pfad + "\" + CR_FilenName_Backup + ".mp4" - End Try - End If - Pfad2 = Chr(34) + Pfad2 + Chr(34) + Pfad2 = Main.Pfad + "\" + CR_FilenName + ".ass" #End Region #Region "Subs" Dim SoftSubs2 As New List(Of String) If LocalSoftSubs.Count > 0 Then For i As Integer = 0 To LocalSoftSubs.Count - 1 - If CBool(InStr(GeckoFX.WebBrowser1.Document.Body.OuterHtml, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + LocalSoftSubs(i) + Chr(34) + ",")) Then + If CBool(InStr(Main.WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + LocalSoftSubs(i) + Chr(34) + ",")) Then SoftSubs2.Add(LocalSoftSubs(i)) Else MsgBox("Softsubtitle for " + LocalSoftSubs(i) + " is not avalible.", MsgBoxStyle.Information) @@ -309,12 +296,11 @@ Public Class SoftSub Dim client0 As New Net.WebClient client0.Encoding = Encoding.UTF8 Dim str0 As String = client0.DownloadString(SoftSub_3) - Dim Pfad3 As String = Pfad2.Replace(".mp4", " " + SoftSubs2(i) + ".ass") - If i = 0 Then - Pfad3 = Pfad2.Replace(".mp4", ".ass") + If File.Exists(Pfad2) Then + Pfad2 = Main.Pfad + "\" + CR_FilenName + " " + SoftSubs2(i) + ".ass" End If - Dim Pfad4 As String = Pfad3.Replace(Chr(34), "") - File.WriteAllText(Pfad4, str0, Encoding.UTF8) + MsgBox(Pfad2 + vbNewLine + Main.Pfad) + File.WriteAllText(Pfad2, str0, Encoding.UTF8) Main.Pause(1) Next End If diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 5c117a0..54474d9 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 e862291..49d8b9e 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/Crunchyroll-Downloader v3.0.zip b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader v3.0.zip deleted file mode 100644 index cc80506..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader v3.0.zip and /dev/null differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index 5c117a0..54474d9 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb index e862291..49d8b9e 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache index c038f9c..affc7b9 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ