Mirrors/Crunchyroll-Downloader-v3.0
2
0
Fork 0
mirror of https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git synced 2025-01-27 15:35:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed WebView2

Browse Source 
removed WebView2 and the browser window
This commit is contained in:
hama3254 2024-05-28 21:26:20 +02:00
parent 28d971b359
commit 2c7d26fe51
15 changed files with 100 additions and 772 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/App.config
View File

@ -39,9 +39,6 @@
<setting name="TempFolder" serializeAs="String"> <setting name="TempFolder" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="Startseite" serializeAs="String">
<value>https://www.crunchyroll.com/</value>
</setting>
<setting name="Prefix_S" serializeAs="String"> <setting name="Prefix_S" serializeAs="String">
<value>[default season prefix]</value> <value>[default season prefix]</value>
</setting> </setting>

112
Crunchyroll Downloader/Browser.Designer.vb generated
View File

@ -1,112 +0,0 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class Browser
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
components.Dispose()
End If
Finally
MyBase.Dispose(disposing)
End Try
End Sub
'Wird vom Windows Form-Designer benötigt.
Private components As System.ComponentModel.IContainer
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.Button1 = New System.Windows.Forms.Button()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.WebView2 = New Microsoft.Web.WebView2.WinForms.WebView2()
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
Me.Timer2 = New System.Windows.Forms.Timer(Me.components)
Me.Panel1.SuspendLayout()
CType(Me.WebView2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'TextBox1
'
Me.TextBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextBox1.Location = New System.Drawing.Point(114, 1)
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(1153, 26)
Me.TextBox1.TabIndex = 1
'
'Button1
'
Me.Button1.Location = New System.Drawing.Point(12, 1)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(96, 26)
Me.Button1.TabIndex = 2
Me.Button1.Text = "Copy URL"
Me.Button1.UseVisualStyleBackColor = True
'
'Panel1
'
Me.Panel1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Panel1.Controls.Add(Me.WebView2)
Me.Panel1.Location = New System.Drawing.Point(0, 30)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(1280, 720)
Me.Panel1.TabIndex = 4
'
'WebView2
'
Me.WebView2.AllowExternalDrop = True
Me.WebView2.CreationProperties = Nothing
Me.WebView2.DefaultBackgroundColor = System.Drawing.Color.White
Me.WebView2.Dock = System.Windows.Forms.DockStyle.Fill
Me.WebView2.Location = New System.Drawing.Point(0, 0)
Me.WebView2.Name = "WebView2"
Me.WebView2.Size = New System.Drawing.Size(1280, 720)
Me.WebView2.TabIndex = 0
Me.WebView2.ZoomFactor = 1.0R
'
'Timer1
'
Me.Timer1.Interval = 60000
'
'Timer2
'
Me.Timer2.Interval = 15000
'
'Browser
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1279, 750)
Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.TextBox1)
Me.MinimumSize = New System.Drawing.Size(480, 480)
Me.Name = "Browser"
Me.ShowIcon = False
Me.Text = "Browser"
Me.Panel1.ResumeLayout(False)
CType(Me.WebView2, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
End Sub
Friend WithEvents TextBox1 As TextBox
Friend WithEvents Button1 As Button
Friend WithEvents Panel1 As Panel
Friend WithEvents Timer1 As Timer
Friend WithEvents Timer2 As Timer
Public WithEvents WebView2 As Microsoft.Web.WebView2.WinForms.WebView2
End Class

126
Crunchyroll Downloader/Browser.resx
View File

@ -1,126 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>106, 17</value>
</metadata>
</root>

209
Crunchyroll Downloader/Browser.vb
View File

@ -1,209 +0,0 @@
Option Strict On
Imports System.IO
Imports System.ComponentModel
Imports System.Threading
Imports System.Net
Imports System.Net.WebUtility
Imports System.IO.Compression
Imports System.Text
Imports System.Security.Policy
Imports Microsoft.Web.WebView2.Core
Imports MetroFramework.Drawing
Imports Newtonsoft.Json.Linq
Public Class Browser
Private Sub WebView2_CoreWebView2InitializationCompleted(sender As Object, e As CoreWebView2InitializationCompletedEventArgs) Handles WebView2.CoreWebView2InitializationCompleted
Try
WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://www.crunchyroll.com/*", CoreWebView2WebResourceContext.All)
'AddHandler WebView2.CoreWebView2.WebResourceResponseReceived, AddressOf ObserveResponse
'AddHandler WebView2.CoreWebView2.WebResourceRequested, AddressOf ObserveHttp 'this is not the data we are looking for (anymore :( )
My.Settings.User_Agend = Chr(34) + "User-Agent: " + WebView2.CoreWebView2.Settings.UserAgent + Chr(34)
If WebView2.CoreWebView2.Source = "about:blank" Or WebView2.CoreWebView2.Source = Nothing Then
'TextBox1.Text = Main.Startseite
WebView2.CoreWebView2.Navigate(Main.Startseite)
End If
Catch ex As Exception
End Try
End Sub
Private Sub WebView2_SourceChanged(sender As Object, e As CoreWebView2SourceChangedEventArgs) Handles WebView2.SourceChanged
Try
TextBox1.Text = WebView2.CoreWebView2.Source
Catch ex As Exception
End Try
End Sub
Private Sub WebView2_NavigationCompleted(sender As Object, e As CoreWebView2NavigationCompletedEventArgs) Handles WebView2.NavigationCompleted
' Dim HTML As String = WebView2.CoreWebView2.
'TextBox1.Text = WebView2.CoreWebView2.Source
' Exit Sub
If e.HttpStatusCode = 200 Then
Dim DocumentTitle As String = WebView2.CoreWebView2.DocumentTitle
Debug.WriteLine("NavigationCompleted: " + Date.Now.ToString)
Main.WebbrowserURL = WebView2.CoreWebView2.Source
TextBox1.Text = Main.WebbrowserURL
Main.WebbrowserTitle = DocumentTitle
Main.ProcessHTML("", Main.WebbrowserURL, DocumentTitle)
GetCookies(Main.WebbrowserURL)
Main.BowserWasOpen = True
'If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
' Anime_Add.btn_dl.Cursor = Cursors.Default
' Anime_Add.btn_dl.BackgroundImage = My.Resources.main_button_download_default
'End If
If Main.Startseite IsNot My.Settings.Startseite Then
Main.LoadBrowser(Main.Startseite, 1)
Main.Startseite = My.Settings.Startseite
End If
End If
End Sub
Public Async Sub GetCookies(ByVal Uri As String)
Try
Main.CookieList = Await WebView2.CoreWebView2.CookieManager.GetCookiesAsync(Uri)
Catch ex As Exception
End Try
End Sub
Private Sub Browser_Load(sender As Object, e As EventArgs) Handles Me.Load
Main.waveOutSetVolume(0, 0)
If Me.Width > My.Computer.Screen.Bounds.Width Then
Me.Width = My.Computer.Screen.Bounds.Width
Panel1.Width = Me.Size.Width - 15 ', Me.Size.Height - 69)
Panel1.Location = New Point(0, 30)
TextBox1.Width = My.Computer.Screen.Bounds.Width - 435
End If
If Me.Size.Height > My.Computer.Screen.Bounds.Height Then
Me.Height = My.Computer.Screen.Bounds.Height
Panel1.Height = Me.Size.Height - 69
Panel1.Location = New Point(0, 30)
End If
Try
Me.Icon = My.Resources.icon
Catch ex As Exception
End Try
If Main.UserBowser = False Then
Me.Location = New Point(-10000, 10000)
'Timer1.Enabled = True
End If
WebView2.Source = New Uri(Main.Startseite)
End Sub
Private Sub Browser_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
Main.BowserWasOpen = False
'Main.UserBowser = False
'Me.Location = New Point(-10000, -10000)
'Main.LoadingUrl = ""
'Debug.WriteLine("Collecting")
'Dim Collector As New TaskCookieVisitor
'Dim CM As ICookieManager = WebBrowser1.GetCookieManager
'CM.VisitAllCookies(Collector)
'Main.CookieList = Collector.Task.Result()
'Debug.WriteLine("Collecting-end")
''e.Cancel = True
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Try
My.Computer.Clipboard.SetText(WebView2.CoreWebView2.Source)
MsgBox("copied: " + Chr(34) + WebView2.CoreWebView2.Source + Chr(34))
Catch ex As Exception
End Try
'My.Computer.Clipboard.SetText(WebBrowser1.Document.Body.InnerHtml)
End Sub
Private Sub TextBox1_KeyDown(sender As Object, e As KeyEventArgs) Handles TextBox1.KeyDown
Try
If e.KeyCode = Keys.Return Then
e.SuppressKeyPress = True
Debug.WriteLine("Start loading: " + Date.Now.ToString)
WebView2.CoreWebView2.Navigate(TextBox1.Text)
End If
Catch ex As Exception
MsgBox("Error in URL", MsgBoxStyle.Critical)
End Try
End Sub
Private Sub ObserveHttp(ByVal sender As Object, ByVal e As CoreWebView2WebResourceRequestedEventArgs) 'Handles RequestResource.GetUrl
' Debug.WriteLine(e.Request.Uri)
If CBool(InStr(e.Request.Uri, "crunchyroll.com")) = True And Main.CrBetaBasic = Nothing Then
Dim Headers As New List(Of KeyValuePair(Of String, String))
Headers.AddRange(e.Request.Headers.ToList)
For i As Integer = 0 To Headers.Count
If CBool(InStr(Headers.Item(i).Value, "Basic")) Then
Main.CrBetaBasic = Headers.Item(i).Value
Debug.WriteLine("Auth-Basic: " + Main.CrBetaBasic)
End If
Next
End If
End Sub
Public Function StringToStream(input As String, enc As Encoding) As Stream
Dim memoryStream = New MemoryStream()
Dim streamWriter = New StreamWriter(memoryStream, enc)
streamWriter.Write(input)
streamWriter.Flush()
memoryStream.Position = 0
Return memoryStream
End Function
Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
'If Main.UserBowser = False Then
' WebView2.Reload()
'Else
' Timer1.Enabled = False
'End If
End Sub
Private Sub Timer2_Tick(sender As Object, e As EventArgs) Handles Timer2.Tick
Me.Close()
End Sub
End Class

25
Crunchyroll Downloader/Crunchyroll Downloader.vbproj
View File

@ -108,15 +108,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>Resources\CRD_metroframework_x64\MetroFramework.dll</HintPath> <HintPath>Resources\CRD_metroframework_x64\MetroFramework.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.1418.22, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.1418.22, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.1418.22, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
</Reference>
<Reference Include="MyProvider, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64"> <Reference Include="MyProvider, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>Resources\CRD_SettingsProvider_x64\MyProvider.dll</HintPath> <HintPath>Resources\CRD_SettingsProvider_x64\MyProvider.dll</HintPath>
@ -208,12 +199,6 @@
<Compile Include="einstellungen.vb"> <Compile Include="einstellungen.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Browser.Designer.vb">
<DependentUpon>Browser.vb</DependentUpon>
</Compile>
<Compile Include="Browser.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="ProcessSleep.vb" /> <Compile Include="ProcessSleep.vb" />
<Compile Include="ErrorDialog.Designer.vb"> <Compile Include="ErrorDialog.Designer.vb">
<DependentUpon>ErrorDialog.vb</DependentUpon> <DependentUpon>ErrorDialog.vb</DependentUpon>
@ -272,9 +257,6 @@
<EmbeddedResource Include="einstellungen.resx"> <EmbeddedResource Include="einstellungen.resx">
<DependentUpon>einstellungen.vb</DependentUpon> <DependentUpon>einstellungen.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Browser.resx">
<DependentUpon>Browser.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CRD_List_Item.resx"> <EmbeddedResource Include="CRD_List_Item.resx">
<DependentUpon>CRD_List_Item.vb</DependentUpon> <DependentUpon>CRD_List_Item.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@ -454,11 +436,4 @@
<WCFMetadata Include="Connected Services\" /> <WCFMetadata Include="Connected Services\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.1418.22\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1418.22\build\Microsoft.Web.WebView2.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1418.22\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1418.22\build\Microsoft.Web.WebView2.targets'))" />
</Target>
</Project> </Project>

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

@ -34,7 +34,6 @@ Partial Class Main
Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components)
Me.Timer4 = New System.Windows.Forms.Timer(Me.components) Me.Timer4 = New System.Windows.Forms.Timer(Me.components)
Me.Btn_add = New System.Windows.Forms.Button() Me.Btn_add = New System.Windows.Forms.Button()
Me.Btn_Browser = New System.Windows.Forms.Button()
Me.Btn_Settings = New System.Windows.Forms.Button() Me.Btn_Settings = New System.Windows.Forms.Button()
Me.Btn_min = New System.Windows.Forms.Button() Me.Btn_min = New System.Windows.Forms.Button()
Me.Btn_Close = New System.Windows.Forms.Button() Me.Btn_Close = New System.Windows.Forms.Button()
@ -50,9 +49,10 @@ Partial Class Main
Me.DummyItemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DummyItemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.LoginFormToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LoginFormToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorDiaTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.Btn_Queue = New System.Windows.Forms.Button() Me.Btn_Queue = New System.Windows.Forms.Button()
Me.ErrorDiaTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BGW_Update = New System.ComponentModel.BackgroundWorker()
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()
@ -113,17 +113,6 @@ Partial Class Main
Me.Btn_add.Name = "Btn_add" Me.Btn_add.Name = "Btn_add"
Me.Btn_add.UseVisualStyleBackColor = False Me.Btn_add.UseVisualStyleBackColor = False
' '
'Btn_Browser
'
Me.Btn_Browser.BackColor = System.Drawing.Color.Transparent
resources.ApplyResources(Me.Btn_Browser, "Btn_Browser")
Me.Btn_Browser.Cursor = System.Windows.Forms.Cursors.Hand
Me.Btn_Browser.FlatAppearance.BorderSize = 0
Me.Btn_Browser.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent
Me.Btn_Browser.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_browser
Me.Btn_Browser.Name = "Btn_Browser"
Me.Btn_Browser.UseVisualStyleBackColor = False
'
'Btn_Settings 'Btn_Settings
' '
Me.Btn_Settings.BackColor = System.Drawing.Color.Transparent Me.Btn_Settings.BackColor = System.Drawing.Color.Transparent
@ -220,6 +209,11 @@ Partial Class Main
Me.LoginFormToolStripMenuItem.Name = "LoginFormToolStripMenuItem" Me.LoginFormToolStripMenuItem.Name = "LoginFormToolStripMenuItem"
resources.ApplyResources(Me.LoginFormToolStripMenuItem, "LoginFormToolStripMenuItem") resources.ApplyResources(Me.LoginFormToolStripMenuItem, "LoginFormToolStripMenuItem")
' '
'ErrorDiaTestToolStripMenuItem
'
Me.ErrorDiaTestToolStripMenuItem.Name = "ErrorDiaTestToolStripMenuItem"
resources.ApplyResources(Me.ErrorDiaTestToolStripMenuItem, "ErrorDiaTestToolStripMenuItem")
'
'Panel1 'Panel1
' '
resources.ApplyResources(Me.Panel1, "Panel1") resources.ApplyResources(Me.Panel1, "Panel1")
@ -236,10 +230,8 @@ 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
' '
'ErrorDiaTestToolStripMenuItem 'BGW_Update
' '
Me.ErrorDiaTestToolStripMenuItem.Name = "ErrorDiaTestToolStripMenuItem"
resources.ApplyResources(Me.ErrorDiaTestToolStripMenuItem, "ErrorDiaTestToolStripMenuItem")
' '
'Main 'Main
' '
@ -252,7 +244,6 @@ Partial Class Main
Me.Controls.Add(Me.Btn_Close) Me.Controls.Add(Me.Btn_Close)
Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_min)
Me.Controls.Add(Me.Btn_Settings) Me.Controls.Add(Me.Btn_Settings)
Me.Controls.Add(Me.Btn_Browser)
Me.Controls.Add(Me.Btn_add) Me.Controls.Add(Me.Btn_add)
Me.Controls.Add(Me.TheTextBox) Me.Controls.Add(Me.TheTextBox)
Me.Controls.Add(Me.ConsoleBar) Me.Controls.Add(Me.ConsoleBar)
@ -281,7 +272,6 @@ Partial Class Main
Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager
Friend WithEvents Timer4 As Timer Friend WithEvents Timer4 As Timer
Friend WithEvents Btn_add As Button Friend WithEvents Btn_add As Button
Friend WithEvents Btn_Browser As Button
Friend WithEvents Btn_Settings As Button Friend WithEvents Btn_Settings As Button
Friend WithEvents Btn_min As Button Friend WithEvents Btn_min As Button
Friend WithEvents Btn_Close As Button Friend WithEvents Btn_Close As Button
@ -300,4 +290,5 @@ Partial Class Main
Friend WithEvents AudioOnlyQualityToolStripMenuItem As ToolStripMenuItem Friend WithEvents AudioOnlyQualityToolStripMenuItem As ToolStripMenuItem
Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ErrorDiaTestToolStripMenuItem As ToolStripMenuItem Friend WithEvents ErrorDiaTestToolStripMenuItem As ToolStripMenuItem
Friend WithEvents BGW_Update As System.ComponentModel.BackgroundWorker
End Class End Class

48
Crunchyroll Downloader/Main.resx
View File

@ -148,7 +148,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;PictureBox5.ZOrder" xml:space="preserve"> <data name="&gt;&gt;PictureBox5.ZOrder" xml:space="preserve">
<value>10</value> <value>9</value>
</data> </data>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>383, 18</value> <value>383, 18</value>
@ -187,7 +187,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;TheTextBox.ZOrder" xml:space="preserve"> <data name="&gt;&gt;TheTextBox.ZOrder" xml:space="preserve">
<value>8</value> <value>7</value>
</data> </data>
<data name="ConsoleBar.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="ConsoleBar.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Stretch</value> <value>Stretch</value>
@ -214,7 +214,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;ConsoleBar.ZOrder" xml:space="preserve"> <data name="&gt;&gt;ConsoleBar.ZOrder" xml:space="preserve">
<value>9</value> <value>8</value>
</data> </data>
<metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
@ -241,7 +241,7 @@
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="Btn_Queue.Location" type="System.Drawing.Point, System.Drawing"> <data name="Btn_Queue.Location" type="System.Drawing.Point, System.Drawing">
<value>575, 18</value> <value>150, 18</value>
</data> </data>
<data name="Btn_Queue.Size" type="System.Drawing.Size, System.Drawing"> <data name="Btn_Queue.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value> <value>80, 35</value>
@ -378,33 +378,6 @@
<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">
<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_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value> <value>Zoom</value>
</data> </data>
@ -433,7 +406,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Btn_add.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_add.ZOrder" xml:space="preserve">
<value>7</value> <value>6</value>
</data> </data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing"> <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt</value> <value>Microsoft Sans Serif, 8.25pt</value>
@ -555,6 +528,12 @@
<data name="&gt;&gt;ErrorDiaTestToolStripMenuItem.Type" xml:space="preserve"> <data name="&gt;&gt;ErrorDiaTestToolStripMenuItem.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;BGW_Update.Name" xml:space="preserve">
<value>BGW_Update</value>
</data>
<data name="&gt;&gt;BGW_Update.Type" xml:space="preserve">
<value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Main</value> <value>Main</value>
</data> </data>
@ -640,7 +619,7 @@
<value>ErrorDiaTest</value> <value>ErrorDiaTest</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>
@ -648,4 +627,7 @@
<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>
<metadata name="BGW_Update.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>509, 49</value>
</metadata>
</root> </root>

172
Crunchyroll Downloader/Main.vb
View File

@ -13,7 +13,6 @@ Imports System.ComponentModel
Imports Newtonsoft.Json.Linq Imports Newtonsoft.Json.Linq
Imports System.Runtime.InteropServices Imports System.Runtime.InteropServices
Imports MyProvider.MyProvider Imports MyProvider.MyProvider
Imports Microsoft.Web.WebView2.Core
Imports Crunchyroll_Downloader.CRD_Classes Imports Crunchyroll_Downloader.CRD_Classes
Public Class Main Public Class Main
@ -39,15 +38,12 @@ Public Class Main
Public Url_locale As String = Nothing Public Url_locale As String = Nothing
Public LoadingUrl As String = "" Public LoadingUrl As String = ""
Public LoadedUrls As New List(Of CoreWebView2WebResourceRequest)
Public Manager As New MetroStyleManager Public Manager As New MetroStyleManager
Public DarkModeValue As Boolean = False Public DarkModeValue As Boolean = False
Public invalids As Char() = System.IO.Path.GetInvalidFileNameChars() Public invalids As Char() = System.IO.Path.GetInvalidFileNameChars()
Dim ServerThread As Thread Dim ServerThread As Thread
Public KodiNaming As Boolean = False Public KodiNaming As Boolean = False
Public ErrorTolerance As Integer = 0 Public ErrorTolerance As Integer = 0
Public CookieList As New List(Of CoreWebView2Cookie)
Public HTMLString As String = My.Resources.Startuphtml Public HTMLString As String = My.Resources.Startuphtml
Public ListBoxList As New List(Of String) Public ListBoxList As New List(Of String)
Public RunningDownloads As Integer = 0 Public RunningDownloads As Integer = 0
@ -111,7 +107,6 @@ Public Class Main
Public GeckoLogFile As String = Nothing Public GeckoLogFile As String = Nothing
Dim SoftSubsString As String Dim SoftSubsString As String
Dim CR_Unlock_Error As String Dim CR_Unlock_Error As String
Public Startseite As String = "https://www.crunchyroll.com/"
Dim SubSprache2 As String Dim SubSprache2 As String
'Dim URL_DL As String 'Dim URL_DL As String
'Dim Pfad_DL As String 'Dim Pfad_DL As String
@ -218,19 +213,6 @@ Public Class Main
Btn_add.Image = My.Resources.main_add Btn_add.Image = My.Resources.main_add
End Sub End Sub
Private Sub Btn_Browser_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Browser.MouseEnter, Btn_Browser.GotFocus
If Manager.Theme = MetroThemeStyle.Dark Then
Btn_Browser.Image = My.Resources.main_browser_invert_dark
Else
Btn_Browser.Image = My.Resources.main_browser_invert
End If
End Sub
Private Sub Btn_Browser_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Browser.MouseLeave, Btn_Browser.LostFocus
Btn_Browser.Image = My.Resources.main_browser
End Sub
Private Sub Btn_Settings_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Settings.MouseEnter, Btn_Settings.GotFocus Private Sub Btn_Settings_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Settings.MouseEnter, Btn_Settings.GotFocus
If Manager.Theme = MetroThemeStyle.Dark Then If Manager.Theme = MetroThemeStyle.Dark Then
Btn_Settings.Image = My.Resources.main_setting_invert_dark Btn_Settings.Image = My.Resources.main_setting_invert_dark
@ -317,8 +299,8 @@ Public Class Main
TheTextBox.Width = Me.Width - 2 TheTextBox.Width = Me.Width - 2
Btn_Close.Location = New Point(Me.Width - 36, 1) Btn_Close.Location = New Point(Me.Width - 36, 1)
Btn_min.Location = New Point(Me.Width - 67, 1) Btn_min.Location = New Point(Me.Width - 67, 1)
Btn_Settings.Location = New Point(Me.Width - 165, 17) Btn_Settings.Location = New Point(Me.Width - 200, 17)
Btn_Queue.Location = New Point(Me.Width - 265, 17) 'Btn_Queue.Location = New Point(Me.Width - 265, 17)
Try Try
Panel1.AutoScrollPosition = New Point(0, 0) Panel1.AutoScrollPosition = New Point(0, 0)
@ -467,9 +449,6 @@ Public Class Main
DefaultSubCR = My.Settings.DefaultSubCR DefaultSubCR = My.Settings.DefaultSubCR
Startseite = My.Settings.Startseite
UseQueue = My.Settings.QueueMode UseQueue = My.Settings.QueueMode
KodiNaming = My.Settings.KodiSupport KodiNaming = My.Settings.KodiSupport
@ -2209,24 +2188,6 @@ Public Class Main
End If End If
End Sub End Sub
Private Sub Btn_Browser_Click(sender As Object, e As EventArgs) Handles Btn_Browser.Click
'Dim Teststring As String = TheTextBox.Text
'TheTextBox.Text = AddScaledBorderAndShadow(Teststring)
'Exit Sub
'Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString)
UserBowser = True
If Application.OpenForms().OfType(Of Browser).Any = True Then
Browser.Location = Me.Location
Else
Browser.Location = Me.Location
Browser.Show()
End If
End Sub
Public Function RemoveExtraSpaces(input_text As String) As String Public Function RemoveExtraSpaces(input_text As String) As String
Dim rsRegEx As System.Text.RegularExpressions.Regex Dim rsRegEx As System.Text.RegularExpressions.Regex
rsRegEx = New System.Text.RegularExpressions.Regex("\s+") rsRegEx = New System.Text.RegularExpressions.Regex("\s+")
@ -2294,60 +2255,6 @@ Public Class Main
#Region "process html"
Public Sub ProcessHTML(ByVal document As String, ByVal Address As String, ByVal DocumentTitle As String)
Dim localHTML As String = document
Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString)
Debug.WriteLine(Address)
If b = True Then
LoadedUrls.Clear()
Grapp_RDY = True
Debug.WriteLine("Just Browsing, exiting...")
'Debug.WriteLine("Just Browsing, exiting... for real...")
Exit Sub
End If
'MsgBox("loaded!")
If CBool(InStr(Address, "crunchyroll.com")) Then
WebbrowserURL = Address
End If
'End If
End Sub
#End Region
Public Sub Navigate(ByVal Url As String)
If Application.OpenForms().OfType(Of Browser).Any = True Then
If InvokeRequired = True Then
Me.Invoke(New Action(Function() As Object
Browser.WebView2.CoreWebView2.Navigate(Url)
Return Nothing
End Function))
Else
Browser.WebView2.CoreWebView2.Navigate(Url)
End If
Else
If InvokeRequired = True Then
Me.Invoke(New Action(Function() As Object
Browser.Show()
Browser.WebView2.CoreWebView2.Navigate(Url)
Return Nothing
End Function))
Else
Browser.Show()
Browser.WebView2.CoreWebView2.Navigate(Url)
End If
End If
End Sub
#Region "server" #Region "server"
Dim ListOfThread As New List(Of Thread) Dim ListOfThread As New List(Of Thread)
Sub ServerStart() Sub ServerStart()
@ -2748,26 +2655,6 @@ Public Class Main
Trackbar.ShowDialog() Trackbar.ShowDialog()
End Sub End Sub
Private Sub MsgBoxToolStripMenuItem_Click(sender As Object, e As EventArgs)
MsgBox(LoadedUrls.Count.ToString)
For i As Integer = 0 To LoadedUrls.Count - 1
MsgBox(LoadedUrls(i))
Next
End Sub
Private Sub CRCookieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CRCookieToolStripMenuItem.Click
'MsgBox(Curl(InputBox("test", "test")))
'For i As Integer = 0 To CookieList.Count - 1
'Next
MsgBox(CookieList.Count.ToString)
'MsgBox(CR_Cookies)
End Sub
Private Sub ItemBoundsToolStripMenuItem_Click(sender As Object, e As EventArgs) Private Sub ItemBoundsToolStripMenuItem_Click(sender As Object, e As EventArgs)
Try Try
@ -2935,7 +2822,6 @@ Public Class Main
LoadingUrl = Url LoadingUrl = Url
LoadedUrls.Clear()
Dim NoBrowser As Boolean = False Dim NoBrowser As Boolean = False
WebbrowserURL = Url WebbrowserURL = Url
@ -3012,7 +2898,7 @@ Public Class Main
ProcessLoading(Url, Auth2, Loc_CR_Cookies, RT_count) ProcessLoading(Url, Auth2, Loc_CR_Cookies, RT_count)
Else Else
Dim v1Token As String = CurlPost("https://beta-api.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494") Dim v1Token As String = CurlPost("https://beta-api.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494")
'MsgBox(v1Token) MsgBox(v1Token)
If CBool(InStr(v1Token, "HTTP Status: 401")) = True Then If CBool(InStr(v1Token, "HTTP Status: 401")) = True Then
MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 401") MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 401")
LoginForm.ShowDialog() LoginForm.ShowDialog()
@ -3107,23 +2993,13 @@ Public Class Main
ObjectJson = CurlAuthNew(ObjectsUrl, Loc_CR_Cookies, Auth2) ObjectJson = CurlAuthNew(ObjectsUrl, Loc_CR_Cookies, Auth2)
Catch ex As Exception Catch ex As Exception
MsgBox(ex.ToString) Error_msg.ShowErrorDia(ex.ToString, "Status: Error getting ObjectJson", True)
'MsgBox(ex.ToString)
Exit Sub Exit Sub
'If CBool(InStr(ex.ToString, "Error - Getting")) Then
' MsgBox("Error invalid CR respone")
' Exit Sub
'Else
' MsgBox("Error processing data")
' Exit Sub
'End If
End Try End Try
If CBool(InStr(ObjectJson, "videos/")) = False Then
If CBool(InStr(ObjectJson, "curl:")) = True Then
Browser.WebView2.CoreWebView2.Navigate(url)
Exit Sub
ElseIf CBool(InStr(ObjectJson, "videos/")) = False Then
'MsgBox(ObjectJson) 'MsgBox(ObjectJson)
Error_msg.ShowErrorDia(ObjectJson, "Status: Failed - no video, check CR login", True) Error_msg.ShowErrorDia(ObjectJson, "Status: Failed - no video, check CR login", True)
@ -3152,7 +3028,7 @@ Public Class Main
' Debug.WriteLine(StreamsUrl) ' Debug.WriteLine(StreamsUrl)
Catch ex As Exception Catch ex As Exception
Browser.WebView2.CoreWebView2.Navigate(url) Error_msg.ShowErrorDia(ex.ToString, "Status: Processing Error", True)
Exit Sub Exit Sub
End Try End Try
@ -3393,6 +3269,38 @@ Public Class Main
Error_msg.ShowErrorDia("Error-Error", "CR returnd : HTTP Status - " + "400") Error_msg.ShowErrorDia("Error-Error", "CR returnd : HTTP Status - " + "400")
End Sub End Sub
Private Sub BGW_Update_DoWork(sender As Object, e As DoWorkEventArgs) Handles BGW_Update.DoWork
Try
Dim client0 As New WebClient
client0.Encoding = Encoding.UTF8
client0.Headers.Add(My.Settings.User_Agend.Replace(Chr(34), ""))
Dim str0 As String = client0.DownloadString("https://api.github.com/repos/hama3254/Crunchyroll-Downloader-v3.0/releases")
Dim GitHubLastIsPre() As String = str0.Split(New String() {Chr(34) + "prerelease" + Chr(34) + ": "}, System.StringSplitOptions.RemoveEmptyEntries)
Dim LastNonPreRelase As Integer = 0
For i As Integer = 1 To GitHubLastIsPre.Count - 1
Dim GitHubLastIsPre1() As String = GitHubLastIsPre(i).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
If GitHubLastIsPre1(0) = "false" Then
LastNonPreRelase = i
Exit For
End If
Next
Dim GitHubLastTag() As String = str0.Split(New String() {Chr(34) + "tag_name" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim GitHubLastTag1() As String = GitHubLastTag(LastNonPreRelase).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries)
'LastVersionString = GitHubLastTag1(0)
'Debug.WriteLine(GitHubLastTag1(0))
Catch ex As Exception
Debug.WriteLine(ex.ToString)
End Try
End Sub
#End Region #End Region

12
Crunchyroll Downloader/My Project/Settings.Designer.vb generated
View File

@ -126,18 +126,6 @@ Namespace My
End Set End Set
End Property End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("https://www.crunchyroll.com/")> _
Public Property Startseite() As String
Get
Return CType(Me("Startseite"),String)
End Get
Set
Me("Startseite") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _ <Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("[default season prefix]")> _ Global.System.Configuration.DefaultSettingValueAttribute("[default season prefix]")> _

3
Crunchyroll Downloader/My Project/Settings.settings
View File

@ -20,9 +20,6 @@
<Setting Name="TempFolder" Type="System.String" Scope="User"> <Setting Name="TempFolder" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="Startseite" Type="System.String" Scope="User">
<Value Profile="(Default)">https://www.crunchyroll.com/</Value>
</Setting>
<Setting Name="Prefix_S" Type="System.String" Scope="User"> <Setting Name="Prefix_S" Type="System.String" Scope="User">
<Value Profile="(Default)">[default season prefix]</Value> <Value Profile="(Default)">[default season prefix]</Value>
</Setting> </Setting>

118
Crunchyroll Downloader/einstellungen.Designer.vb generated
View File

@ -38,6 +38,7 @@ Partial Class Einstellungen
Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage()
Me.GroupBox23 = New System.Windows.Forms.GroupBox() Me.GroupBox23 = New System.Windows.Forms.GroupBox()
Me.GroupBox18 = New System.Windows.Forms.GroupBox() Me.GroupBox18 = New System.Windows.Forms.GroupBox()
Me.CB_HideQueue = New MetroFramework.Controls.MetroCheckBox()
Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox() Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox()
Me.GroupBox16 = New System.Windows.Forms.GroupBox() Me.GroupBox16 = New System.Windows.Forms.GroupBox()
Me.MetroLabel3 = New MetroFramework.Controls.MetroLabel() Me.MetroLabel3 = New MetroFramework.Controls.MetroLabel()
@ -100,9 +101,6 @@ Partial Class Einstellungen
Me.Chb_Ign_tls = New MetroFramework.Controls.MetroCheckBox() Me.Chb_Ign_tls = New MetroFramework.Controls.MetroCheckBox()
Me.http_support = New MetroFramework.Controls.MetroComboBox() Me.http_support = New MetroFramework.Controls.MetroComboBox()
Me.DarkMode = New MetroFramework.Controls.MetroCheckBox() Me.DarkMode = New MetroFramework.Controls.MetroCheckBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.Label1 = New MetroFramework.Controls.MetroLabel()
Me.TextBox1 = New MetroFramework.Controls.MetroTextBox()
Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox() Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox()
Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown() Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
Me.TabControl1 = New MetroFramework.Controls.MetroTabControl() Me.TabControl1 = New MetroFramework.Controls.MetroTabControl()
@ -144,7 +142,7 @@ Partial Class Einstellungen
Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.Label5 = New MetroFramework.Controls.MetroLabel()
Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
Me.Btn_Save = New System.Windows.Forms.Button() Me.Btn_Save = New System.Windows.Forms.Button()
Me.CB_HideQueue = New MetroFramework.Controls.MetroCheckBox() Me.CB_Update_Pre = New MetroFramework.Controls.MetroCheckBox()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox14.SuspendLayout() Me.GroupBox14.SuspendLayout()
Me.SoftSubs.SuspendLayout() Me.SoftSubs.SuspendLayout()
@ -163,7 +161,6 @@ Partial Class Einstellungen
Me.GroupBox6.SuspendLayout() Me.GroupBox6.SuspendLayout()
CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox5.SuspendLayout() Me.GroupBox5.SuspendLayout()
Me.GroupBox1.SuspendLayout()
Me.DL_Count_simultaneous.SuspendLayout() Me.DL_Count_simultaneous.SuspendLayout()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabControl1.SuspendLayout() Me.TabControl1.SuspendLayout()
@ -374,6 +371,17 @@ Partial Class Einstellungen
Me.GroupBox18.TabStop = False Me.GroupBox18.TabStop = False
Me.GroupBox18.Text = "Multi-Download" Me.GroupBox18.Text = "Multi-Download"
' '
'CB_HideQueue
'
Me.CB_HideQueue.AutoSize = True
Me.CB_HideQueue.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_HideQueue.Location = New System.Drawing.Point(328, 21)
Me.CB_HideQueue.Name = "CB_HideQueue"
Me.CB_HideQueue.Size = New System.Drawing.Size(112, 19)
Me.CB_HideQueue.TabIndex = 6
Me.CB_HideQueue.Text = "hidden Queue"
Me.CB_HideQueue.UseSelectable = True
'
'ListViewAdd_True 'ListViewAdd_True
' '
Me.ListViewAdd_True.AutoSize = True Me.ListViewAdd_True.AutoSize = True
@ -839,7 +847,6 @@ Partial Class Einstellungen
Me.TabPage1.Controls.Add(Me.GroupBox21) Me.TabPage1.Controls.Add(Me.GroupBox21)
Me.TabPage1.Controls.Add(Me.GroupBox6) Me.TabPage1.Controls.Add(Me.GroupBox6)
Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox5)
Me.TabPage1.Controls.Add(Me.GroupBox1)
Me.TabPage1.Controls.Add(Me.DL_Count_simultaneous) Me.TabPage1.Controls.Add(Me.DL_Count_simultaneous)
Me.TabPage1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TabPage1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TabPage1.HorizontalScrollbar = True Me.TabPage1.HorizontalScrollbar = True
@ -863,7 +870,7 @@ Partial Class Einstellungen
Me.GroupBox21.Controls.Add(Me.CB_HideSF) Me.GroupBox21.Controls.Add(Me.CB_HideSF)
Me.GroupBox21.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox21.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox21.ForeColor = System.Drawing.Color.Black Me.GroupBox21.ForeColor = System.Drawing.Color.Black
Me.GroupBox21.Location = New System.Drawing.Point(5, 417) Me.GroupBox21.Location = New System.Drawing.Point(5, 349)
Me.GroupBox21.Name = "GroupBox21" Me.GroupBox21.Name = "GroupBox21"
Me.GroupBox21.Size = New System.Drawing.Size(490, 67) Me.GroupBox21.Size = New System.Drawing.Size(490, 67)
Me.GroupBox21.TabIndex = 81 Me.GroupBox21.TabIndex = 81
@ -893,7 +900,7 @@ Partial Class Einstellungen
Me.GroupBox6.Controls.Add(Me.NumericUpDown2) Me.GroupBox6.Controls.Add(Me.NumericUpDown2)
Me.GroupBox6.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox6.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox6.ForeColor = System.Drawing.Color.Black Me.GroupBox6.ForeColor = System.Drawing.Color.Black
Me.GroupBox6.Location = New System.Drawing.Point(5, 299) Me.GroupBox6.Location = New System.Drawing.Point(5, 231)
Me.GroupBox6.Name = "GroupBox6" Me.GroupBox6.Name = "GroupBox6"
Me.GroupBox6.Size = New System.Drawing.Size(490, 112) Me.GroupBox6.Size = New System.Drawing.Size(490, 112)
Me.GroupBox6.TabIndex = 80 Me.GroupBox6.TabIndex = 80
@ -944,12 +951,13 @@ Partial Class Einstellungen
Me.GroupBox5.BackColor = System.Drawing.Color.Transparent Me.GroupBox5.BackColor = System.Drawing.Color.Transparent
Me.GroupBox5.Controls.Add(Me.Chb_Ign_tls) Me.GroupBox5.Controls.Add(Me.Chb_Ign_tls)
Me.GroupBox5.Controls.Add(Me.http_support) Me.GroupBox5.Controls.Add(Me.http_support)
Me.GroupBox5.Controls.Add(Me.CB_Update_Pre)
Me.GroupBox5.Controls.Add(Me.DarkMode) Me.GroupBox5.Controls.Add(Me.DarkMode)
Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox5.ForeColor = System.Drawing.Color.Black Me.GroupBox5.ForeColor = System.Drawing.Color.Black
Me.GroupBox5.Location = New System.Drawing.Point(5, 179) Me.GroupBox5.Location = New System.Drawing.Point(5, 85)
Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(490, 114) Me.GroupBox5.Size = New System.Drawing.Size(490, 140)
Me.GroupBox5.TabIndex = 70 Me.GroupBox5.TabIndex = 70
Me.GroupBox5.TabStop = False Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "Other" Me.GroupBox5.Text = "Other"
@ -958,7 +966,7 @@ Partial Class Einstellungen
' '
Me.Chb_Ign_tls.AutoSize = True Me.Chb_Ign_tls.AutoSize = True
Me.Chb_Ign_tls.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.Chb_Ign_tls.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.Chb_Ign_tls.Location = New System.Drawing.Point(135, 80) Me.Chb_Ign_tls.Location = New System.Drawing.Point(242, 43)
Me.Chb_Ign_tls.Name = "Chb_Ign_tls" Me.Chb_Ign_tls.Name = "Chb_Ign_tls"
Me.Chb_Ign_tls.Size = New System.Drawing.Size(223, 19) Me.Chb_Ign_tls.Size = New System.Drawing.Size(223, 19)
Me.Chb_Ign_tls.TabIndex = 46 Me.Chb_Ign_tls.TabIndex = 46
@ -974,9 +982,9 @@ Partial Class Einstellungen
Me.http_support.IntegralHeight = False Me.http_support.IntegralHeight = False
Me.http_support.ItemHeight = 23 Me.http_support.ItemHeight = 23
Me.http_support.Items.AddRange(New Object() {"add-on support disabled", "80", "8080"}) Me.http_support.Items.AddRange(New Object() {"add-on support disabled", "80", "8080"})
Me.http_support.Location = New System.Drawing.Point(214, 25) Me.http_support.Location = New System.Drawing.Point(242, 90)
Me.http_support.Name = "http_support" Me.http_support.Name = "http_support"
Me.http_support.Size = New System.Drawing.Size(237, 29) Me.http_support.Size = New System.Drawing.Size(223, 29)
Me.http_support.TabIndex = 45 Me.http_support.TabIndex = 45
Me.http_support.UseSelectable = True Me.http_support.UseSelectable = True
' '
@ -984,70 +992,13 @@ Partial Class Einstellungen
' '
Me.DarkMode.AutoSize = True Me.DarkMode.AutoSize = True
Me.DarkMode.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.DarkMode.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.DarkMode.Location = New System.Drawing.Point(41, 30) Me.DarkMode.Location = New System.Drawing.Point(39, 43)
Me.DarkMode.Name = "DarkMode" Me.DarkMode.Name = "DarkMode"
Me.DarkMode.Size = New System.Drawing.Size(135, 19) Me.DarkMode.Size = New System.Drawing.Size(135, 19)
Me.DarkMode.TabIndex = 5 Me.DarkMode.TabIndex = 5
Me.DarkMode.Text = "enable dark mode" Me.DarkMode.Text = "enable dark mode"
Me.DarkMode.UseSelectable = True Me.DarkMode.UseSelectable = True
' '
'GroupBox1
'
Me.GroupBox1.BackColor = System.Drawing.Color.Transparent
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.TextBox1)
Me.GroupBox1.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox1.ForeColor = System.Drawing.Color.Black
Me.GroupBox1.Location = New System.Drawing.Point(5, 85)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(490, 88)
Me.GroupBox1.TabIndex = 60
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Browser Settings"
'
'Label1
'
Me.Label1.FontWeight = MetroFramework.MetroLabelWeight.Regular
Me.Label1.Location = New System.Drawing.Point(6, 20)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(469, 22)
Me.Label1.TabIndex = 2
Me.Label1.Text = "Default Website"
Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'TextBox1
'
'
'
'
Me.TextBox1.CustomButton.Image = Nothing
Me.TextBox1.CustomButton.Location = New System.Drawing.Point(445, 1)
Me.TextBox1.CustomButton.Name = ""
Me.TextBox1.CustomButton.Size = New System.Drawing.Size(23, 23)
Me.TextBox1.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
Me.TextBox1.CustomButton.TabIndex = 1
Me.TextBox1.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
Me.TextBox1.CustomButton.UseSelectable = True
Me.TextBox1.CustomButton.Visible = False
Me.TextBox1.FontSize = MetroFramework.MetroTextBoxSize.Medium
Me.TextBox1.Lines = New String() {"https://www.crunchyroll.com/"}
Me.TextBox1.Location = New System.Drawing.Point(6, 45)
Me.TextBox1.MaxLength = 32767
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
Me.TextBox1.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.TextBox1.SelectedText = ""
Me.TextBox1.SelectionLength = 0
Me.TextBox1.SelectionStart = 0
Me.TextBox1.ShortcutsEnabled = True
Me.TextBox1.Size = New System.Drawing.Size(469, 25)
Me.TextBox1.TabIndex = 2
Me.TextBox1.Text = "https://www.crunchyroll.com/"
Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
Me.TextBox1.UseSelectable = True
Me.TextBox1.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.TextBox1.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
'
'DL_Count_simultaneous 'DL_Count_simultaneous
' '
Me.DL_Count_simultaneous.BackColor = System.Drawing.Color.Transparent Me.DL_Count_simultaneous.BackColor = System.Drawing.Color.Transparent
@ -1083,7 +1034,7 @@ Partial Class Einstellungen
Me.TabControl1.ItemSize = New System.Drawing.Size(86, 50) Me.TabControl1.ItemSize = New System.Drawing.Size(86, 50)
Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Location = New System.Drawing.Point(22, 60)
Me.TabControl1.Name = "TabControl1" Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 1 Me.TabControl1.SelectedIndex = 0
Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.Size = New System.Drawing.Size(509, 567)
Me.TabControl1.TabIndex = 0 Me.TabControl1.TabIndex = 0
Me.TabControl1.UseSelectable = True Me.TabControl1.UseSelectable = True
@ -1646,16 +1597,16 @@ Partial Class Einstellungen
Me.Btn_Save.TabIndex = 9 Me.Btn_Save.TabIndex = 9
Me.Btn_Save.UseVisualStyleBackColor = False Me.Btn_Save.UseVisualStyleBackColor = False
' '
'CB_HideQueue 'CB_Update_Pre
' '
Me.CB_HideQueue.AutoSize = True Me.CB_Update_Pre.AutoSize = True
Me.CB_HideQueue.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CB_Update_Pre.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_HideQueue.Location = New System.Drawing.Point(328, 21) Me.CB_Update_Pre.Location = New System.Drawing.Point(39, 90)
Me.CB_HideQueue.Name = "CB_HideQueue" Me.CB_Update_Pre.Name = "CB_Update_Pre"
Me.CB_HideQueue.Size = New System.Drawing.Size(112, 19) Me.CB_Update_Pre.Size = New System.Drawing.Size(176, 19)
Me.CB_HideQueue.TabIndex = 6 Me.CB_Update_Pre.TabIndex = 5
Me.CB_HideQueue.Text = "hidden Queue" Me.CB_Update_Pre.Text = "Pre-Release Notifications"
Me.CB_HideQueue.UseSelectable = True Me.CB_Update_Pre.UseSelectable = True
' '
'Einstellungen 'Einstellungen
' '
@ -1700,7 +1651,6 @@ Partial Class Einstellungen
CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.ResumeLayout(False)
Me.GroupBox5.PerformLayout() Me.GroupBox5.PerformLayout()
Me.GroupBox1.ResumeLayout(False)
Me.DL_Count_simultaneous.ResumeLayout(False) Me.DL_Count_simultaneous.ResumeLayout(False)
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabControl1.ResumeLayout(False) Me.TabControl1.ResumeLayout(False)
@ -1748,7 +1698,6 @@ Partial Class Einstellungen
Friend WithEvents FFMPEG_CommandP4 As ToolStripMenuItem Friend WithEvents FFMPEG_CommandP4 As ToolStripMenuItem
Friend WithEvents GB_Resolution As GroupBox Friend WithEvents GB_Resolution As GroupBox
Friend WithEvents GroupBox5 As GroupBox Friend WithEvents GroupBox5 As GroupBox
Friend WithEvents GroupBox1 As GroupBox
Friend WithEvents DL_Count_simultaneous As GroupBox Friend WithEvents DL_Count_simultaneous As GroupBox
Friend WithEvents NumericUpDown1 As NumericUpDown Friend WithEvents NumericUpDown1 As NumericUpDown
Friend WithEvents SoftSubs As GroupBox Friend WithEvents SoftSubs As GroupBox
@ -1762,7 +1711,6 @@ Partial Class Einstellungen
Friend WithEvents TabPage7 As TabPage Friend WithEvents TabPage7 As TabPage
Friend WithEvents PictureBox7 As PictureBox Friend WithEvents PictureBox7 As PictureBox
Friend WithEvents Button1 As Button Friend WithEvents Button1 As Button
Friend WithEvents Label1 As MetroFramework.Controls.MetroLabel
Friend WithEvents Label2 As MetroFramework.Controls.MetroLabel Friend WithEvents Label2 As MetroFramework.Controls.MetroLabel
Public WithEvents Label4 As MetroFramework.Controls.MetroLabel Public WithEvents Label4 As MetroFramework.Controls.MetroLabel
Public WithEvents Label6 As MetroFramework.Controls.MetroLabel Public WithEvents Label6 As MetroFramework.Controls.MetroLabel
@ -1779,7 +1727,6 @@ Partial Class Einstellungen
Public WithEvents Label3 As MetroFramework.Controls.MetroLabel Public WithEvents Label3 As MetroFramework.Controls.MetroLabel
Friend WithEvents MetroLabel1 As MetroFramework.Controls.MetroLabel Friend WithEvents MetroLabel1 As MetroFramework.Controls.MetroLabel
Friend WithEvents DarkMode As MetroFramework.Controls.MetroCheckBox Friend WithEvents DarkMode As MetroFramework.Controls.MetroCheckBox
Friend WithEvents TextBox1 As MetroFramework.Controls.MetroTextBox
Friend WithEvents CB_CR_Harsubs As MetroFramework.Controls.MetroComboBox Friend WithEvents CB_CR_Harsubs As MetroFramework.Controls.MetroComboBox
Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel
Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
@ -1845,4 +1792,5 @@ Partial Class Einstellungen
Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox
Friend WithEvents AMD_AV1 As ToolStripMenuItem Friend WithEvents AMD_AV1 As ToolStripMenuItem
Friend WithEvents CB_HideQueue As MetroFramework.Controls.MetroCheckBox Friend WithEvents CB_HideQueue As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CB_Update_Pre As MetroFramework.Controls.MetroCheckBox
End Class End Class

3
Crunchyroll Downloader/einstellungen.resx
View File

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

13
Crunchyroll Downloader/einstellungen.vb
View File

@ -190,7 +190,7 @@ Public Class Einstellungen
NumericUpDown2.Value = Main.ErrorTolerance NumericUpDown2.Value = Main.ErrorTolerance
NumericUpDown1.Value = Main.MaxDL NumericUpDown1.Value = Main.MaxDL
TextBox1.Text = Main.Startseite
Try Try
@ -367,15 +367,9 @@ Public Class Einstellungen
End If End If
' MsgBox(Name_season.Text) ' MsgBox(Name_season.Text)
If CBool(InStr(TextBox1.Text, "https://")) Then
Main.Startseite = TextBox1.Text
My.Settings.Startseite = Main.Startseite
ElseIf TextBox1.Text = Nothing Then
Main.Startseite = "https://www.crunchyroll.com/"
My.Settings.Startseite = Main.Startseite
Else
End If
If DD_Season_Prefix.Text IsNot "[default season prefix]" Then If DD_Season_Prefix.Text IsNot "[default season prefix]" Then
Main.Season_Prefix = DD_Season_Prefix.Text Main.Season_Prefix = DD_Season_Prefix.Text
My.Settings.Prefix_S = Main.Season_Prefix My.Settings.Prefix_S = Main.Season_Prefix
@ -696,7 +690,6 @@ Public Class Einstellungen
DL_Count_simultaneous.ForeColor = color DL_Count_simultaneous.ForeColor = color
GB_Resolution.ForeColor = color GB_Resolution.ForeColor = color
GB_Filename_Pre.ForeColor = color GB_Filename_Pre.ForeColor = color
GroupBox1.ForeColor = color
GroupBox2.ForeColor = color GroupBox2.ForeColor = color
GroupBox3.ForeColor = color GroupBox3.ForeColor = color
GroupBox4.ForeColor = color GroupBox4.ForeColor = color

1
Crunchyroll Downloader/packages.config
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Microsoft.Web.WebView2" version="1.0.1418.22" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
</packages> </packages>