Audio only added, new Funimation implemented

added "AAC (audio only)" as output format
added handling for the new funimation website (#271)

Crunchyroll Downloader/CRD_List_Item.vb

@@ -22,7 +22,7 @@ Public Class CRD_List_Item
     Dim Finished As Boolean = False
     Dim Label_website_Text As String = Nothing
     Dim StatusRunning As Boolean = True
-    Dim ffmpeg_command As String = Nothing
+    'Dim ffmpeg_command As String = Nothing
     Dim Debug2 As Boolean = False
     Dim MergeSubstoMP4 As Boolean = False
 
@@ -178,9 +178,7 @@ Public Class CRD_List_Item
     End Function
 #End Region
 #Region "Set Variables"
-    Public Sub Setffmpeg_command(ByVal Value As String)
-        ffmpeg_command = Value
-    End Sub
+
     Public Sub SetMergeSubstoMP4(ByVal Value As Boolean)
         MergeSubstoMP4 = Value
     End Sub

Crunchyroll Downloader/Crunchyroll Downloader.vbproj

@@ -98,6 +98,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\metroframework-modern-ui\MetroFramework\bin\x86\Debug\MetroFramework.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />

Crunchyroll Downloader/GeckoFX.vb

@@ -187,7 +187,7 @@ Public Class GeckoFX
 
                     Else
                         Main.Text = "Status: no video found"
-                        Anime_Add.StatusLabel.Text = "fail?"
+                        Anime_Add.StatusLabel.Text = "Status: no video found"
                     End If
                 End If
             ElseIf CBool(InStr(WebBrowser1.Url.ToString, "anime-on-demand.de")) Then
@@ -464,14 +464,15 @@ Public Class GeckoFX
         End If
         If CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then
             If Main.b = False Then
-                Main.GetBetaVideo(requesturl, Main.WebbrowserURL)
+                Main.GetBetaVideoProxy(requesturl, Main.WebbrowserURL)
+                Main.b = True
                 Exit Sub
             End If
         ElseIf CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then
             'Debug.WriteLine(requesturl)
             If Main.b = False Then
-                'Main.WebbrowserURL = WebBrowser1.Url.ToString
                 Main.GetBetaSeasons(requesturl)
+                Main.b = True
                 Exit Sub
             End If
 
@@ -482,16 +483,19 @@ Public Class GeckoFX
             Main.FunimationAPIRegion = "?region=" + parms(1)
             If Main.b = False Then
                 If CBool(InStr(requesturl, "https://title-api.prd.funimationsvc.com/v1/show")) And CBool(InStr(requesturl, "/episodes/")) Then
-
+                    Main.GetFunimationJS_VideoProxy(requesturl)
+                    Main.b = True
+                    Exit Sub
                 Else
-                    MsgBox(Main.WebbrowserURL)
                     Anime_Add.ProcessFunimationJS(Main.WebbrowserURL)
                     Main.b = True
+                    Exit Sub
                 End If
 
 
             End If
         End If
+
         If ScanTrue = True Then
 
             If InStr(requesturl, ".m3u8") Then

Crunchyroll Downloader/einstellungen.Designer.vb

@@ -403,10 +403,10 @@ Partial Class Einstellungen
         Me.TabPage2.HorizontalScrollbarBarColor = True
         Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False
         Me.TabPage2.HorizontalScrollbarSize = 10
-        Me.TabPage2.Location = New System.Drawing.Point(4, 35)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 44)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(501, 461)
+        Me.TabPage2.Size = New System.Drawing.Size(501, 452)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Output"
         Me.TabPage2.VerticalScrollbarBarColor = True
@@ -529,7 +529,7 @@ Partial Class Einstellungen
         Me.CB_Format.FormattingEnabled = True
         Me.CB_Format.IntegralHeight = False
         Me.CB_Format.ItemHeight = 23
-        Me.CB_Format.Items.AddRange(New Object() {"MP4", "MKV"})
+        Me.CB_Format.Items.AddRange(New Object() {"MP4", "MKV", "AAC (Audio only)"})
         Me.CB_Format.Location = New System.Drawing.Point(6, 30)
         Me.CB_Format.Name = "CB_Format"
         Me.CB_Format.Size = New System.Drawing.Size(225, 29)
@@ -1032,7 +1032,7 @@ Partial Class Einstellungen
         Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
         Me.TabControl1.Location = New System.Drawing.Point(22, 60)
         Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 5
+        Me.TabControl1.SelectedIndex = 1
         Me.TabControl1.Size = New System.Drawing.Size(509, 500)
         Me.TabControl1.TabIndex = 38
         Me.TabControl1.UseSelectable = True

Crunchyroll Downloader/einstellungen.resx

@@ -126,6 +126,9 @@
   <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>118, 20</value>
   </metadata>
+  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>118, 20</value>
+  </metadata>
   <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>332, 20</value>
   </metadata>

Crunchyroll Downloader/einstellungen.vb

@@ -17,7 +17,7 @@ Public Class Einstellungen
 
     Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
-        Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Beta-U6"
+        Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Beta-U7"
         BackgroundWorker1.RunWorkerAsync()
 
 
@@ -137,7 +137,8 @@ Public Class Einstellungen
         End If
         If Main.VideoFormat = ".mkv" Then
             CB_Format.SelectedItem = "MKV"
-
+        ElseIf Main.VideoFormat = ".aac" Then
+            CB_Format.SelectedItem = "AAC (Audio only)"
         Else
             CB_Format.SelectedItem = "MP4"
         End If
@@ -505,6 +506,10 @@ Public Class Einstellungen
             Main.VideoFormat = ".mkv"
             Main.MergeSubsFormat = "copy"
             rk.SetValue("VideoFormat", ".mkv", RegistryValueKind.String)
+        ElseIf CB_Format.Text = "AAC (Audio only)" Then
+            Main.VideoFormat = ".aac"
+            Main.MergeSubsFormat = "mov_text"
+            rk.SetValue("VideoFormat", ".aac", RegistryValueKind.String)
         Else
             Main.VideoFormat = ".mp4"
             Main.MergeSubsFormat = "mov_text"
@@ -1148,6 +1153,24 @@ Public Class Einstellungen
         LastVersion.Text = "last release: " + LastVersionString
     End Sub
 
+    Private Sub CB_Format_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Format.SelectedIndexChanged
+        If CB_Format.Text = "AAC (Audio only)" Then
+            If MergeMP4.Checked = True Then
+                MsgBox("Merged subs are not avalible with audio only!", MsgBoxStyle.Information)
+            End If
+            MergeMP4.Checked = False
+        End If
+    End Sub
+
+    Private Sub MergeMP4_CheckedChanged(sender As Object, e As EventArgs) Handles MergeMP4.CheckedChanged
+        If CB_Format.Text = "AAC (Audio only)" Then
+            If MergeMP4.Checked = True Then
+                MsgBox("Merged subs are not avalible with audio only!", MsgBoxStyle.Information)
+            End If
+            MergeMP4.Checked = False
+        End If
+    End Sub
+
 
 
 

Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-53fa3dc8e7bcc1c4e2eaa760ce92c5a3d6c0033f
+d0c95a6fd14c359e337b0b0b69686382f2d73bc9

Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt

@@ -144,3 +144,5 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crun
 D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\bin\x86\Debug\MetroFramework.pdb
 D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.ErrorDialog.resources
 D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.network_scan.resources
+D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\bin\x86\Debug\Newtonsoft.Json.dll
+D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\bin\x86\Debug\Newtonsoft.Json.xml

Crunchyroll Downloader/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Geckofx60.32" version="60.0.55" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
 </packages>

packages/Newtonsoft.Json.13.0.1/LICENSE.md

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.