-
-
-
-
-
-
-
-
-
- diff --git a/.gitignore b/.gitignore index e2fc9c7..ed846d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.zip *.zip +*.mp4 diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 758334d..34c1a78 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 98e47b5..2081906 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 75a3576..885c9b1 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 14213d1..31b8f01 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/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 2c7fcf5..e7e5c11 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -12,7 +12,7 @@ Public Class CRD_List_Item Dim Label_website_Text As String = Nothing Dim StatusRunning As Boolean = True - Dim UsedMap As String = Nothing + 'Dim UsedMap As String = Nothing Dim ffmpeg_command As String = Nothing Dim Debug2 As Boolean = False Dim MergeSubstoMP4 As Boolean = False @@ -92,9 +92,9 @@ Public Class CRD_List_Item End Function #End Region #Region "Set Variables" - Public Sub SetUsedMap(ByVal Value As String) - UsedMap = Value - End Sub + 'Public Sub SetUsedMap(ByVal Value As String) + ' UsedMap = Value + 'End Sub Public Sub Setffmpeg_command(ByVal Value As String) ffmpeg_command = Value End Sub @@ -220,26 +220,28 @@ Public Class CRD_List_Item #Region "Download + Update UI" - Public Function DownloadFFMPEG(ByVal DL_URL As String, ByVal DL_Pfad As String, ByVal Filename As String) As String + Public Function DownloadFFMPEG(ByVal DLCommand As String, ByVal DL_Pfad As String, ByVal Filename As String) As String DownloadPfad = DL_Pfad - HistoryDL_URL = DL_URL + HistoryDL_URL = DLCommand HistoryDL_Pfad = DL_Pfad HistoryFilename = Filename Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" Dim startinfo As New System.Diagnostics.ProcessStartInfo 'Dim cmd As String = "-i " + Chr(34) + URL_DL + Chr(34) + " -c copy -bsf:a aac_adtstoasc " + Pfad_DL 'start ffmpeg with command strFFCMD string - Dim cmd As String = "-i " + Chr(34) + DL_URL + Chr(34) + " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string - If MergeSubstoMP4 = True Then - If CBool(InStr(DL_URL, "-i " + Chr(34))) = True Then - cmd = DL_URL + " " + DL_Pfad - End If - End If - If UsedMap = Nothing Then - Else - cmd = "-i " + Chr(34) + DL_URL + Chr(34) + " -map 0:a " + "-map " + UsedMap + " " + ffmpeg_command + " " + DL_Pfad - UsedMap = Nothing - End If + Dim cmd As String = DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string + + 'If MergeSubstoMP4 = True Then + ' If CBool(InStr(DL_URL, "-i " + Chr(34))) = True Then + ' cmd = DL_URL + " " + DL_Pfad + ' End If + 'End If + + 'If UsedMap = Nothing Then + 'Else + + ' UsedMap = Nothing + 'End If If Debug2 = True Then MsgBox(cmd) End If @@ -353,6 +355,13 @@ Public Class CRD_List_Item Label_percent.Text = Math.Round(DownloadFinished, 2, MidpointRounding.AwayFromZero).ToString + "MB/" + Math.Round(FileSize, 2, MidpointRounding.AwayFromZero).ToString + "MB " + percent.ToString + "%" Return Nothing End Function)) + + ElseIf InStr(e.Data, "muxing overhead:") Then + Me.Invoke(New Action(Function() + Dim Done As String() = Label_percent.Text.Split(New String() {"MB"}, System.StringSplitOptions.RemoveEmptyEntries) + Label_percent.Text = "Finsihed - " + Done(0) + "MB" + Return Nothing + End Function)) End If diff --git a/Crunchyroll Downloader/Debug_Mode.vb b/Crunchyroll Downloader/Debug_Mode.vb index 7e5589d..71429d9 100644 --- a/Crunchyroll Downloader/Debug_Mode.vb +++ b/Crunchyroll Downloader/Debug_Mode.vb @@ -76,10 +76,10 @@ End Sub Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click - Main.FFMPEG_Reso(RichTextBox2.Text) + 'Main.FFMPEG_Reso(RichTextBox2.Text) End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click - MsgBox(Main.ResoAvalibe) + 'MsgBox(Main.ResoAvalibe) End Sub End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index f0668bf..ee78154 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -295,7 +295,7 @@ Public Class Main End Sub - Public Sub ListItemAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String) + Public Sub ListItemAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String) ', ByVal AudioLang As String) Dim Thumbnail As Image = My.Resources.main_del Try Dim wc As New WebClient() @@ -320,7 +320,7 @@ Public Class Main Item.Width = 838 Item.Height = 142 #Region "Set Variables" - Item.SetUsedMap(UsedMap) + 'Item.SetUsedMap(UsedMap) Item.Setffmpeg_command(ffmpeg_command) Item.SetMergeSubstoMP4(MergeSubstoMP4) Item.SetDebug2(Debug2) @@ -1079,6 +1079,7 @@ Public Class Main 'Throw New System.Exception("Test") Grapp_RDY = False Dim CR_Anime_Titel As String = Nothing + Dim CR_Anime_Dub As String = Nothing Dim CR_Anime_Staffel As String = Nothing Dim CR_Anime_Folge As String = Nothing #Region "Name + Pfad" @@ -1289,6 +1290,10 @@ Public Class Main Dim s() As String = hls_List(i).Split(New String() {Chr(34) + "hardsub_lang" + Chr(34) + ":" + SubSprache2 + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) CR_URI_Master = s(1).Replace("\/", "/") + Dim dub() As String = hls_List(i).Split(New String() {Chr(34) + "audio_lang" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + + Dim dub2() As String = dub(0).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) + CR_Anime_Dub = dub2(0) 'MsgBox(CR_URI_Master) End If Next @@ -1372,9 +1377,9 @@ Public Class Main #End Region If Resu = 42 Then If MergeSubstoMP4 = True Then - URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata Else - URL_DL = CR_URI_Master + URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command End If 'MsgBox(URL_DL) Else @@ -1414,9 +1419,12 @@ Public Class Main Dim VLC_URI_2 As String() = VLC_URI_1(1).Split(New [Char]() {Chr(34)}) Dim VLC_URI_3 As String() = VLC_URI_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) If MergeSubstoMP4 = True Then - URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + + 'URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata Else - URL_DL = VLC_URI_3(0).Trim() + URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command + 'URL_DL = VLC_URI_3(0).Trim() End If 'MsgBox(URL_DL) End If @@ -1780,25 +1788,25 @@ Public Class Main #Region "
- Kommentare
-