Mirrors/Crunchyroll-Downloader-v3.0
2
0
Fork 0
mirror of https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git synced 2024-12-25 07:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

added url guessing

Browse Source 
added url guessin/merging (new api) #911
This commit is contained in:
hama3254 2024-03-15 18:04:55 +01:00
parent ea63b56ba6
commit a7b5c312fd
7 changed files with 207 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Crunchyroll Downloader/v17/.suo
View File

Binary file not shown.

3
Crunchyroll Downloader/Browser.vb
View File

@ -21,8 +21,9 @@ Public Class Browser
Try Try
WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://www.crunchyroll.com/*", CoreWebView2WebResourceContext.All) WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://www.crunchyroll.com/*", CoreWebView2WebResourceContext.All)
WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://www.funimation.com/*", CoreWebView2WebResourceContext.All) WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://www.funimation.com/*", CoreWebView2WebResourceContext.All)
'WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://cr-play-service.prd.crunchyrollsvc.com/*", CoreWebView2WebResourceContext.All)
' WebView2.CoreWebView2.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All) ' WebView2.CoreWebView2.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All)
'cr-play-service.prd.crunchyrollsvc.com
'WebView2.CoreWebView2.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All) 'WebView2.CoreWebView2.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All)
AddHandler WebView2.CoreWebView2.WebResourceResponseReceived, AddressOf ObserveResponse AddHandler WebView2.CoreWebView2.WebResourceResponseReceived, AddressOf ObserveResponse
AddHandler WebView2.CoreWebView2.WebResourceRequested, AddressOf ObserveHttp AddHandler WebView2.CoreWebView2.WebResourceRequested, AddressOf ObserveHttp

4
Crunchyroll Downloader/GetData.vb
View File

@ -53,11 +53,11 @@ Module GetData
If CBool(InStr(CurlError, "curl:")) Then If CBool(InStr(CurlError, "curl:")) Then
Debug.WriteLine(CurlError) Debug.WriteLine("CurlError: " + CurlError)
Throw New System.Exception("Error - Getting" + vbNewLine + CurlError) Throw New System.Exception("Error - Getting" + vbNewLine + CurlError)
Return Nothing Return Nothing
ElseIf CBool(InStr(CurlOutput, "curl:")) Then ElseIf CBool(InStr(CurlOutput, "curl:")) Then
Debug.WriteLine(CurlOutput) Debug.WriteLine("CurlOutput: " + CurlOutput)
Throw New System.Exception("Error - Getting" + vbNewLine + CurlError) Throw New System.Exception("Error - Getting" + vbNewLine + CurlError)
Return Nothing Return Nothing
Else Else

20
Crunchyroll Downloader/Main.designer.vb generated
View File

@ -50,10 +50,9 @@ Partial Class Main
Me.CRCookieToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CRCookieToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UrlJsonsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UrlJsonsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DummyItemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DummyItemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.ScanTimeout = New System.Windows.Forms.Timer(Me.components)
Me.Btn_Queue = New System.Windows.Forms.Button()
Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Btn_Queue = New System.Windows.Forms.Button()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -221,15 +220,16 @@ Partial Class Main
Me.DummyItemToolStripMenuItem.Name = "DummyItemToolStripMenuItem" Me.DummyItemToolStripMenuItem.Name = "DummyItemToolStripMenuItem"
resources.ApplyResources(Me.DummyItemToolStripMenuItem, "DummyItemToolStripMenuItem") resources.ApplyResources(Me.DummyItemToolStripMenuItem, "DummyItemToolStripMenuItem")
' '
'AudioOnlyQualityToolStripMenuItem
'
Me.AudioOnlyQualityToolStripMenuItem.Name = "AudioOnlyQualityToolStripMenuItem"
resources.ApplyResources(Me.AudioOnlyQualityToolStripMenuItem, "AudioOnlyQualityToolStripMenuItem")
'
'Panel1 'Panel1
' '
resources.ApplyResources(Me.Panel1, "Panel1") resources.ApplyResources(Me.Panel1, "Panel1")
Me.Panel1.Name = "Panel1" Me.Panel1.Name = "Panel1"
' '
'ScanTimeout
'
Me.ScanTimeout.Interval = 1000
'
'Btn_Queue 'Btn_Queue
' '
Me.Btn_Queue.BackColor = System.Drawing.Color.Transparent Me.Btn_Queue.BackColor = System.Drawing.Color.Transparent
@ -241,11 +241,6 @@ Partial Class Main
Me.Btn_Queue.Name = "Btn_Queue" Me.Btn_Queue.Name = "Btn_Queue"
Me.Btn_Queue.UseVisualStyleBackColor = False Me.Btn_Queue.UseVisualStyleBackColor = False
' '
'AudioOnlyQualityToolStripMenuItem
'
Me.AudioOnlyQualityToolStripMenuItem.Name = "AudioOnlyQualityToolStripMenuItem"
resources.ApplyResources(Me.AudioOnlyQualityToolStripMenuItem, "AudioOnlyQualityToolStripMenuItem")
'
'Main 'Main
' '
Me.ApplyImageInvert = True Me.ApplyImageInvert = True
@ -300,7 +295,6 @@ Partial Class Main
Friend WithEvents UrlJsonsToolStripMenuItem As ToolStripMenuItem Friend WithEvents UrlJsonsToolStripMenuItem As ToolStripMenuItem
Friend WithEvents DummyItemToolStripMenuItem As ToolStripMenuItem Friend WithEvents DummyItemToolStripMenuItem As ToolStripMenuItem
Public WithEvents Panel1 As Panel Public WithEvents Panel1 As Panel
Friend WithEvents ScanTimeout As Timer
Friend WithEvents QueueToolStripMenuItem As ToolStripMenuItem Friend WithEvents QueueToolStripMenuItem As ToolStripMenuItem
Friend WithEvents Btn_Queue As Button Friend WithEvents Btn_Queue As Button
Friend WithEvents SaveThumbnailAsImageToolStripMenuItem As ToolStripMenuItem Friend WithEvents SaveThumbnailAsImageToolStripMenuItem As ToolStripMenuItem

335
Crunchyroll Downloader/Main.resx
View File

@ -231,6 +231,24 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>900, 630</value> <value>900, 630</value>
</data> </data>
<data name="Btn_Queue.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_Queue.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Queue.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_Queue.Location" type="System.Drawing.Point, System.Drawing">
<value>575, 18</value>
</data>
<data name="Btn_Queue.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_Queue.TabIndex" type="System.Int32, mscorlib">
<value>70</value>
</data>
<data name="&gt;&gt;Btn_Queue.Name" xml:space="preserve"> <data name="&gt;&gt;Btn_Queue.Name" xml:space="preserve">
<value>Btn_Queue</value> <value>Btn_Queue</value>
</data> </data>
@ -243,6 +261,21 @@
<data name="&gt;&gt;Btn_Queue.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Queue.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="Panel1.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 71</value>
</data>
<data name="Panel1.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>898, 403</value>
</data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>898, 546</value>
</data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;Panel1.Name" xml:space="preserve"> <data name="&gt;&gt;Panel1.Name" xml:space="preserve">
<value>Panel1</value> <value>Panel1</value>
</data> </data>
@ -255,6 +288,24 @@
<data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
<value>2</value> <value>2</value>
</data> </data>
<data name="Btn_Close.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="Btn_Close.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Close.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_Close.Location" type="System.Drawing.Point, System.Drawing">
<value>800, 1</value>
</data>
<data name="Btn_Close.Size" type="System.Drawing.Size, System.Drawing">
<value>35, 35</value>
</data>
<data name="Btn_Close.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;Btn_Close.Name" xml:space="preserve"> <data name="&gt;&gt;Btn_Close.Name" xml:space="preserve">
<value>Btn_Close</value> <value>Btn_Close</value>
</data> </data>
@ -267,6 +318,24 @@
<data name="&gt;&gt;Btn_Close.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Close.ZOrder" xml:space="preserve">
<value>3</value> <value>3</value>
</data> </data>
<data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="Btn_min.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_min.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_min.Location" type="System.Drawing.Point, System.Drawing">
<value>757, 1</value>
</data>
<data name="Btn_min.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 30</value>
</data>
<data name="Btn_min.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;Btn_min.Name" xml:space="preserve"> <data name="&gt;&gt;Btn_min.Name" xml:space="preserve">
<value>Btn_min</value> <value>Btn_min</value>
</data> </data>
@ -279,6 +348,24 @@
<data name="&gt;&gt;Btn_min.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_min.ZOrder" xml:space="preserve">
<value>4</value> <value>4</value>
</data> </data>
<data name="Btn_Settings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_Settings.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Settings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_Settings.Location" type="System.Drawing.Point, System.Drawing">
<value>665, 18</value>
</data>
<data name="Btn_Settings.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_Settings.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;Btn_Settings.Name" xml:space="preserve"> <data name="&gt;&gt;Btn_Settings.Name" xml:space="preserve">
<value>Btn_Settings</value> <value>Btn_Settings</value>
</data> </data>
@ -291,6 +378,21 @@
<data name="&gt;&gt;Btn_Settings.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Settings.ZOrder" xml:space="preserve">
<value>5</value> <value>5</value>
</data> </data>
<data name="Btn_Browser.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_Browser.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Browser.Location" type="System.Drawing.Point, System.Drawing">
<value>140, 18</value>
</data>
<data name="Btn_Browser.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_Browser.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;Btn_Browser.Name" xml:space="preserve"> <data name="&gt;&gt;Btn_Browser.Name" xml:space="preserve">
<value>Btn_Browser</value> <value>Btn_Browser</value>
</data> </data>
@ -303,6 +405,24 @@
<data name="&gt;&gt;Btn_Browser.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Browser.ZOrder" xml:space="preserve">
<value>6</value> <value>6</value>
</data> </data>
<data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_add.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_add.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_add.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 18</value>
</data>
<data name="Btn_add.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_add.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;Btn_add.Name" xml:space="preserve"> <data name="&gt;&gt;Btn_add.Name" xml:space="preserve">
<value>Btn_add</value> <value>Btn_add</value>
</data> </data>
@ -429,12 +549,6 @@
<data name="&gt;&gt;DummyItemToolStripMenuItem.Type" xml:space="preserve"> <data name="&gt;&gt;DummyItemToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;ScanTimeout.Name" xml:space="preserve">
<value>ScanTimeout</value>
</data>
<data name="&gt;&gt;ScanTimeout.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;AudioOnlyQualityToolStripMenuItem.Name" xml:space="preserve"> <data name="&gt;&gt;AudioOnlyQualityToolStripMenuItem.Name" xml:space="preserve">
<value>AudioOnlyQualityToolStripMenuItem</value> <value>AudioOnlyQualityToolStripMenuItem</value>
</data> </data>
@ -450,153 +564,6 @@
<metadata name="Timer4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Timer4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>276, 52</value> <value>276, 52</value>
</metadata> </metadata>
<data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_add.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_add.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_add.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 18</value>
</data>
<data name="Btn_add.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_add.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;Btn_add.Name" xml:space="preserve">
<value>Btn_add</value>
</data>
<data name="&gt;&gt;Btn_add.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Btn_add.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Btn_add.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="Btn_Browser.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_Browser.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Browser.Location" type="System.Drawing.Point, System.Drawing">
<value>140, 18</value>
</data>
<data name="Btn_Browser.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_Browser.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;Btn_Browser.Name" xml:space="preserve">
<value>Btn_Browser</value>
</data>
<data name="&gt;&gt;Btn_Browser.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Btn_Browser.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Btn_Browser.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="Btn_Settings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_Settings.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Settings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_Settings.Location" type="System.Drawing.Point, System.Drawing">
<value>665, 18</value>
</data>
<data name="Btn_Settings.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_Settings.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;Btn_Settings.Name" xml:space="preserve">
<value>Btn_Settings</value>
</data>
<data name="&gt;&gt;Btn_Settings.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Btn_Settings.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Btn_Settings.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="Btn_min.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_min.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_min.Location" type="System.Drawing.Point, System.Drawing">
<value>757, 1</value>
</data>
<data name="Btn_min.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 30</value>
</data>
<data name="Btn_min.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;Btn_min.Name" xml:space="preserve">
<value>Btn_min</value>
</data>
<data name="&gt;&gt;Btn_min.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Btn_min.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Btn_min.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="Btn_Close.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="Btn_Close.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Close.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_Close.Location" type="System.Drawing.Point, System.Drawing">
<value>800, 1</value>
</data>
<data name="Btn_Close.Size" type="System.Drawing.Size, System.Drawing">
<value>35, 35</value>
</data>
<data name="Btn_Close.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;Btn_Close.Name" xml:space="preserve">
<value>Btn_Close</value>
</data>
<data name="&gt;&gt;Btn_Close.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Btn_Close.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Btn_Close.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>352, 49</value> <value>352, 49</value>
</metadata> </metadata>
@ -673,7 +640,7 @@
<value>audio only Quality</value> <value>audio only Quality</value>
</data> </data>
<data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing"> <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 290</value> <value>234, 268</value>
</data> </data>
<data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve"> <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
<value>ContextMenuStrip1</value> <value>ContextMenuStrip1</value>
@ -681,64 +648,4 @@
<data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve"> <data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="Panel1.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 71</value>
</data>
<data name="Panel1.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>898, 403</value>
</data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>898, 546</value>
</data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;Panel1.Name" xml:space="preserve">
<value>Panel1</value>
</data>
<data name="&gt;&gt;Panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Panel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="ScanTimeout.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>167, 10</value>
</metadata>
<data name="Btn_Queue.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="Btn_Queue.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="Btn_Queue.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Btn_Queue.Location" type="System.Drawing.Point, System.Drawing">
<value>575, 18</value>
</data>
<data name="Btn_Queue.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="Btn_Queue.TabIndex" type="System.Int32, mscorlib">
<value>70</value>
</data>
<data name="&gt;&gt;Btn_Queue.Name" xml:space="preserve">
<value>Btn_Queue</value>
</data>
<data name="&gt;&gt;Btn_Queue.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Btn_Queue.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Btn_Queue.ZOrder" xml:space="preserve">
<value>1</value>
</data>
</root> </root>

168
Crunchyroll Downloader/Main.vb
View File

@ -49,7 +49,6 @@ Public Class Main
Public CrBetaBasic As String = Nothing Public CrBetaBasic As String = Nothing
Public locale As String = Nothing Public locale As String = Nothing
Public Url_locale As String = Nothing Public Url_locale As String = Nothing
Dim ProcessCounting As Integer = 30
'Public CrBetaObjects As String = Nothing 'Public CrBetaObjects As String = Nothing
'Public CrBetaStreams As String = Nothing 'Public CrBetaStreams As String = Nothing
'Public CrBetaStreamsUrl As String = Nothing 'Public CrBetaStreamsUrl As String = Nothing
@ -100,8 +99,9 @@ Public Class Main
'Public NonCR_URL As String = Nothing 'Public NonCR_URL As String = Nothing
Public DlSoftSubsRDY As Boolean = True Public DlSoftSubsRDY As Boolean = True
Public DialogTaskString As String Public DialogTaskString As String
'Public ErrorBrowserString As String Dim NewAPIString1 As String
'Public ErrorBrowserUrl As String Dim NewAPIString2 As String
Dim TTL As Integer = 0
'Public ErrorBrowserBackString As String 'Public ErrorBrowserBackString As String
Public RunningQueue As Boolean = False Public RunningQueue As Boolean = False
Public UserCloseDialog As Boolean = False Public UserCloseDialog As Boolean = False
@ -1195,8 +1195,10 @@ Public Class Main
'Debug.WriteLine("1457: " + i.ToString + "/" + CR_Streams.Count.ToString + " " + CR_Streams.Item(i).subLang + " " + CR_Streams.Item(i).Format) 'Debug.WriteLine("1457: " + i.ToString + "/" + CR_Streams.Count.ToString + " " + CR_Streams.Item(i).subLang + " " + CR_Streams.Item(i).Format)
If CR_Streams.Item(i).subLang = CR_HardSubLang Then If CR_Streams.Item(i).subLang = CR_HardSubLang Then
CR_URI_Master.Add(CR_Streams.Item(i).Url) CR_URI_Master.Add(CR_Streams.Item(i).Url)
'Debug.WriteLine("CR_HardSubLang-" + CR_HardSubLang + "--" + CR_Streams.Item(i).Url)
ElseIf CR_Streams.Item(i).subLang = "" And CR_HardSubLang = "null" Then ElseIf CR_Streams.Item(i).subLang = "" And CR_HardSubLang = "null" Then
CR_URI_Master.Add(CR_Streams.Item(i).Url) CR_URI_Master.Add(CR_Streams.Item(i).Url)
'Debug.WriteLine("CR_HardSubLang-null" + CR_HardSubLang + "--" + CR_Streams.Item(i).Url)
ElseIf CR_Streams.Item(i).subLang = "" And CR_audio_locale IsNot "ja-JP" And DubMode = True Then 'nothing/raw ElseIf CR_Streams.Item(i).subLang = "" And CR_audio_locale IsNot "ja-JP" And DubMode = True Then 'nothing/raw
RawStream.Add(CR_Streams.Item(i).Url) RawStream.Add(CR_Streams.Item(i).Url)
End If End If
@ -1326,6 +1328,7 @@ Public Class Main
For i As Integer = 0 To CR_URI_Master.Count - 1 For i As Integer = 0 To CR_URI_Master.Count - 1
'MsgBox(CR_URI_Master(i))
Dim Count As String = (i + 1).ToString Dim Count As String = (i + 1).ToString
Try Try
str = Curl(CR_URI_Master(i)) str = Curl(CR_URI_Master(i))
@ -1925,7 +1928,7 @@ Public Class Main
For Each Entry As JProperty In item.Values For Each Entry As JProperty In item.Values
Dim JsonEntryFormat As String = Entry.Name Dim JsonEntryFormat As String = Entry.Name
If CBool(InStr(Entry.Name, "drm")) Or CBool(InStr(Entry.Name, "dash")) Or CBool(InStr(Entry.Name, "download")) Then If CBool(InStr(Entry.Name, "drm")) Or CBool(InStr(Entry.Name, "dash")) Or CBool(InStr(Entry.Name, "urls")) Then
Continue For Continue For
End If End If
@ -1971,9 +1974,13 @@ Public Class Main
End Select End Select
Next Next
If download_hls IsNot Nothing Then
CR_Streams.Add(download_hls)
End If
Dim CR_URI_Master As New List(Of String) Dim CR_URI_Master As New List(Of String)
' Dim CR_URI_Master2 As New List(Of CR_Beta_Stream)
Dim RawStream As New List(Of String) Dim RawStream As New List(Of String)
@ -1981,17 +1988,17 @@ Public Class Main
For c As Integer = 0 To CR_Streams.Count - 1 For c As Integer = 0 To CR_Streams.Count - 1
Dim i As Integer = c Dim i As Integer = c
'Debug.WriteLine("1457: " + i.ToString + "/" + CR_Streams.Count.ToString + " " + CR_Streams.Item(i).subLang + " " + CR_Streams.Item(i).Format)
'https://www.crunchyroll.com/watch/GN7UD2K8N/dragon-ball-super-super-hero Debug.WriteLine(c.ToString + " Streams-1988: " + CR_Streams.Item(i).subLang + " " + CR_Streams.Item(i).Format + " " + CR_Streams.Item(i).Url)
Debug.WriteLine("Streams-1254: " + CR_Streams.Item(i).subLang)
If CR_Streams.Item(i).subLang = CR_HardSubLang Then If CR_Streams.Item(i).subLang = CR_HardSubLang Then
CR_URI_Master.Add(CR_Streams.Item(i).Url) CR_URI_Master.Add(CR_Streams.Item(i).Url)
'MsgBox(CR_Streams.Item(i).Format + CR_Streams.Item(i).Url)
ElseIf CR_Streams.Item(i).subLang = "" And CR_audio_locale IsNot "ja-JP" And DubMode = True Then 'nothing/raw ohne subs ElseIf CR_Streams.Item(i).subLang = "" And CR_audio_locale IsNot "ja-JP" And DubMode = True Then 'nothing/raw ohne subs
RawStream.Add(CR_Streams.Item(i).Url) RawStream.Add(CR_Streams.Item(i).Url)
ElseIf CR_Streams.Item(i).subLang = "null" And CR_audio_locale IsNot "ja-JP" And DubMode = True Then 'nothing/raw mit 'null' tagged ElseIf CR_Streams.Item(i).subLang = "null" And CR_audio_locale IsNot "ja-JP" And DubMode = True Then 'nothing/raw mit 'null' tagged
RawStream.Add(CR_Streams.Item(i).Url) RawStream.Add(CR_Streams.Item(i).Url)
End If End If
Next Next
'MsgBox(CR_URI_Master.Count.ToString) 'MsgBox(CR_URI_Master.Count.ToString)
If CR_URI_Master.Count = 0 And RawStream.Count > 0 Then If CR_URI_Master.Count = 0 And RawStream.Count > 0 Then
@ -2364,28 +2371,67 @@ Public Class Main
Dim str As String = Nothing Dim str As String = Nothing
Dim NewMaster2 As String = Nothing
If NewAPIString1 = Nothing And NewAPIString2 = Nothing Or TTL < 1 Then
For i As Integer = 0 To CR_URI_Master.Count - 1 Dim NewAPI_0 As String() = WebsiteURL.Split(New String() {"watch/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Count As String = (i + 1).ToString Dim NewAPI_1 As String() = NewAPI_0(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Try
str = Curl(CR_URI_Master(i))
If CBool(InStr(str, "curl:")) = False Then
Exit For
End If
Catch ex As Exception
Me.Invoke(New Action(Function() As Object Dim NewAPI As String = "https://cr-play-service.prd.crunchyrollsvc.com/v1/" + NewAPI_1(0) + "/web/edge/play"
Anime_Add.StatusLabel.Text = "failed accessing master.m3u8 " + Count + "/" + CR_URI_Master.Count.ToString
Me.Text = "failed accessing master.m3u8 " + Count + "/" + CR_URI_Master.Count.ToString Dim NewAPIData As String = CurlAuthNew(NewAPI, Loc_CR_Cookies, Loc_AuthToken)
Me.Invalidate()
Return Nothing 'MsgBox(NewAPIData)
End Function))
Debug.WriteLine("Error accessing master #" + i.ToString + " -- " + CR_URI_Master(i)) Dim bif_1 As String() = NewAPIData.Split(New String() {".bif?"}, System.StringSplitOptions.RemoveEmptyEntries) 'get the policy and beyond
Pause(5) Dim bif_2 As String() = bif_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) 'but we don't need beyond | Index 0 is enough
End Try '
Next Dim bif_0 As String() = bif_1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) 'again we don't need beyond the url
Dim bif_3 As String() = bif_0(bif_0.Count - 1).Split(New String() {"assets/"}, System.StringSplitOptions.RemoveEmptyEntries) 'we even don't need the asset itself
Dim NewMaster0 As String() = CR_URI_Master(0).Split(New String() {"assets/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim NewMaster1 As String() = NewMaster0(1).Split(New String() {"?Policy"}, System.StringSplitOptions.RemoveEmptyEntries)
NewMaster2 = bif_3(0) + "assets/" + NewMaster1(0) + "?" + bif_2(0)
NewAPIString1 = bif_3(0)
NewAPIString2 = bif_2(0)
TTL = 5
Else
Dim NewMaster0 As String() = CR_URI_Master(0).Split(New String() {"assets/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim NewMaster1 As String() = NewMaster0(1).Split(New String() {"?Policy"}, System.StringSplitOptions.RemoveEmptyEntries)
NewMaster2 = NewAPIString1 + "assets/" + NewMaster1(0) + "?" + NewAPIString2
TTL = TTL - 1
End If
'MsgBox(NewMaster2)
str = Curl(NewMaster2)
'For i As Integer = 0 To CR_URI_Master.Count - 1
' Dim Count As String = (i + 1).ToString
' Try
' str = Curl(CR_URI_Master(i))
' If CBool(InStr(str, "curl:")) = False Then
' Exit For
' End If
' Catch ex As Exception
' Me.Invoke(New Action(Function() As Object
' Anime_Add.StatusLabel.Text = "failed accessing master.m3u8 " + Count + "/" + CR_URI_Master.Count.ToString
' Me.Text = "failed accessing master.m3u8 " + Count + "/" + CR_URI_Master.Count.ToString
' Me.Invalidate()
' Return Nothing
' End Function))
' Debug.WriteLine("Error accessing master #" + i.ToString + " -- " + CR_URI_Master(i))
' Pause(5)
' End Try
'Next
@ -4161,7 +4207,7 @@ Public Class Main
If CBool(InStr(Address, "crunchyroll.com")) Or CBool(InStr(Address, "funimation.com")) Then If CBool(InStr(Address, "crunchyroll.com")) Or CBool(InStr(Address, "funimation.com")) Then
WebbrowserURL = Address WebbrowserURL = Address
ScanTimeout.Start() ' ScanTimeout.Start()
'ElseIf CBool(InStr(Address, "funimation.com")) Then 'ElseIf CBool(InStr(Address, "funimation.com")) Then
@ -4209,75 +4255,7 @@ Public Class Main
#End Region #End Region
Private Sub Process(sender As Object, e As EventArgs) Handles ScanTimeout.Tick
If b = True Then
If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
Anime_Add.StatusLabel.Text = "Status: idle"
End If
Me.Text = "Crunchyroll Downloader"
Grapp_RDY = True
LoadedUrls.Clear()
Debug.WriteLine("canceled....")
ProcessCounting = 30
ScanTimeout.Enabled = False
Exit Sub
End If
If LoadedUrls.Count = 0 And ProcessCounting > 0 Then
If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
Anime_Add.StatusLabel.Text = "Status: Processing Url " + ProcessCounting.ToString
End If
Me.Text = "Status: Processing Url " + ProcessCounting.ToString
ProcessCounting = ProcessCounting - 1
Exit Sub
ElseIf LoadedUrls.Count = 1 And ProcessCounting > 0 Then
If CBool(InStr(LoadedUrls.Item(0).Uri, "/objects/")) Then
If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
Anime_Add.StatusLabel.Text = "Status: Processing Url " + ProcessCounting.ToString
End If
Me.Text = "Status: Processing Url " + ProcessCounting.ToString
ProcessCounting = ProcessCounting - 1
Exit Sub
End If
ElseIf LoadedUrls.Count = 0 And ProcessCounting = 0 Then
If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
Anime_Add.StatusLabel.Text = "Status: nothing found"
End If
Me.Text = "Status: nothing found"
'ProcessUrls()
b = True
Debug.WriteLine("3508: nothing found")
Grapp_RDY = True
ProcessCounting = 30
ScanTimeout.Enabled = False
Exit Sub
End If
Debug.WriteLine("LoadedUrls: " + LoadedUrls.Count.ToString)
'For i As Integer = 0 To LoadedUrls.Count - 1
' Debug.WriteLine("LoadedUrls: " + LoadedUrls(i))
'Next
If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
Anime_Add.StatusLabel.Text = "Status: Processing... "
End If
Me.Text = "Status: Processing... "
Debug.WriteLine("ProcessUrls")
ProcessCounting = 30
ScanTimeout.Enabled = False
ProcessUrls()
Exit Sub
End Sub
Public Sub ProcessUrls() Public Sub ProcessUrls()
Debug.WriteLine(LoadedUrls.Count.ToString) Debug.WriteLine(LoadedUrls.Count.ToString)
Debug.WriteLine(Date.Now.ToString + " Thread Name: " + Thread.CurrentThread.Name) Debug.WriteLine(Date.Now.ToString + " Thread Name: " + Thread.CurrentThread.Name)

4
Crunchyroll Downloader/My Project/AssemblyInfo.vb
View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.17.3")> <Assembly: AssemblyVersion("3.18")>
<Assembly: AssemblyFileVersion("3.17.3")> <Assembly: AssemblyFileVersion("3.18")>
<Assembly: NeutralResourcesLanguage("en")> <Assembly: NeutralResourcesLanguage("en")>