mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-11-14 04:05:07 +01:00
fixes
fix funimation hardsub subtitle url fix funimation path handling fix funimation merge softsubs
This commit is contained in:
hama3254
parent
001eea9452
commit
b512ad831e
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -353,7 +353,7 @@ Public Class Anime_Add
|
||||
Try
|
||||
Using client As New WebClient()
|
||||
client.Encoding = System.Text.Encoding.UTF8
|
||||
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
|
||||
client.Headers.Add(My.Resources.ffmpeg_user_agend)
|
||||
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
|
||||
client.Headers.Add("Accept-Encoding: gzip, deflate, br")
|
||||
client.Headers.Add("X-Requested-With: XMLHttpRequest")
|
||||
@ -386,7 +386,7 @@ Public Class Anime_Add
|
||||
Try
|
||||
Using client As New WebClient()
|
||||
client.Encoding = System.Text.Encoding.UTF8
|
||||
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
|
||||
client.Headers.Add(My.Resources.ffmpeg_user_agend)
|
||||
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
|
||||
client.Headers.Add("Accept-Encoding: gzip, deflate, br")
|
||||
client.Headers.Add("X-Requested-With: XMLHttpRequest")
|
||||
|
||||
@ -788,7 +788,7 @@ Public Class CRD_List_Item
|
||||
|
||||
Dim exepath As String = Application.StartupPath + "\ffmpeg.exe"
|
||||
Dim startinfo As New System.Diagnostics.ProcessStartInfo
|
||||
Dim cmd As String = "-headers " + Chr(34) + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
Dim cmd As String = "-headers " + My.Resources.ffmpeg_user_agend + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
|
||||
If Debug2 = True Then
|
||||
MsgBox(cmd)
|
||||
@ -984,7 +984,7 @@ Public Class CRD_List_Item
|
||||
'MsgBox(BaseURL + SiteList(i) + vbNewLine + Pfad_DL + "\" + SiteList(i))
|
||||
Dim iWert As Integer = i
|
||||
Using client As New WebClient()
|
||||
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0")
|
||||
client.Headers.Add(My.Resources.ffmpeg_user_agend)
|
||||
client.DownloadFile(BaseURL + SiteList(i), Pfad_DL + "\" + SiteList(i))
|
||||
Pause(1)
|
||||
End Using
|
||||
|
||||
@ -144,12 +144,6 @@
|
||||
<Compile Include="Debug_Mode.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FirstStartup.Designer.vb">
|
||||
<DependentUpon>FirstStartup.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FirstStartup.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="GeckoFX.Designer.vb">
|
||||
<DependentUpon>GeckoFX.vb</DependentUpon>
|
||||
</Compile>
|
||||
@ -202,9 +196,6 @@
|
||||
<EmbeddedResource Include="Debug_Mode.resx">
|
||||
<DependentUpon>Debug_Mode.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FirstStartup.resx">
|
||||
<DependentUpon>FirstStartup.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="GeckoFX.resx">
|
||||
<DependentUpon>GeckoFX.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
8
Crunchyroll Downloader/ErrorDialog.Designer.vb
generated
8
Crunchyroll Downloader/ErrorDialog.Designer.vb
generated
@ -1,6 +1,6 @@
|
||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
|
||||
Partial Class ErrorDialog
|
||||
Inherits System.Windows.Forms.Form
|
||||
Inherits MetroFramework.Forms.MetroForm
|
||||
|
||||
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||
<System.Diagnostics.DebuggerNonUserCode()>
|
||||
@ -97,7 +97,7 @@ Partial Class ErrorDialog
|
||||
Me.StatusLabel.Text = "Status: idle"
|
||||
Me.StatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
|
||||
'
|
||||
'Reso
|
||||
'ErrorDialog
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
@ -105,9 +105,7 @@ Partial Class ErrorDialog
|
||||
Me.ClientSize = New System.Drawing.Size(380, 280)
|
||||
Me.Controls.Add(Me.GroupBox3)
|
||||
Me.Controls.Add(Me.pictureBox3)
|
||||
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
|
||||
Me.Name = "Reso"
|
||||
Me.Text = "crunchyroll downloader"
|
||||
Me.Name = "ErrorDialog"
|
||||
CType(Me.pictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.GroupBox3.ResumeLayout(False)
|
||||
Me.GroupBox3.PerformLayout()
|
||||
|
||||
@ -40,6 +40,7 @@
|
||||
#End Region
|
||||
|
||||
Private Sub Reso_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
' Me.StyleManager = Main.StyleManager
|
||||
'ButtonResoNotFound.Text = Main.ButtonResoNotFoundText
|
||||
Try
|
||||
Me.Icon = My.Resources.icon
|
||||
|
||||
38
Crunchyroll Downloader/FirstStartup.Designer.vb
generated
38
Crunchyroll Downloader/FirstStartup.Designer.vb
generated
@ -1,38 +0,0 @@
|
||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
||||
Partial Class FirstStartup
|
||||
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.SuspendLayout()
|
||||
'
|
||||
'FirstStartup
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(800, 450)
|
||||
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
|
||||
Me.Name = "FirstStartup"
|
||||
Me.Text = "FirstStartup"
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
@ -1,120 +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>
|
||||
</root>
|
||||
@ -1,53 +0,0 @@
|
||||
Public Class FirstStartup
|
||||
Private Sub FistStartup_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Try
|
||||
Me.Icon = My.Resources.icon
|
||||
Catch ex As Exception
|
||||
|
||||
End Try
|
||||
|
||||
End Sub
|
||||
|
||||
#Region " Move Form "
|
||||
|
||||
' [ Move Form ]
|
||||
'
|
||||
' // By Elektro
|
||||
|
||||
Public MoveForm As Boolean
|
||||
Public MoveForm_MousePosition As Point
|
||||
|
||||
Public Sub MoveForm_MouseDown(sender As Object, e As MouseEventArgs) Handles _
|
||||
MyBase.MouseDown ' Add more handles here (Example: PictureBox1.MouseDown)
|
||||
|
||||
If e.Button = MouseButtons.Left Then
|
||||
MoveForm = True
|
||||
Me.Cursor = Cursors.NoMove2D
|
||||
MoveForm_MousePosition = e.Location
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Public Sub MoveForm_MouseMove(sender As Object, e As MouseEventArgs) Handles _
|
||||
MyBase.MouseMove ' Add more handles here (Example: PictureBox1.MouseMove)
|
||||
|
||||
If MoveForm Then
|
||||
Me.Location = Me.Location + (e.Location - MoveForm_MousePosition)
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Public Sub MoveForm_MouseUp(sender As Object, e As MouseEventArgs) Handles _
|
||||
MyBase.MouseUp ' Add more handles here (Example: PictureBox1.MouseUp)
|
||||
|
||||
If e.Button = MouseButtons.Left Then
|
||||
MoveForm = False
|
||||
Me.Cursor = Cursors.Default
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
#End Region
|
||||
|
||||
End Class
|
||||
5
Crunchyroll Downloader/Main.designer.vb
generated
5
Crunchyroll Downloader/Main.designer.vb
generated
@ -175,7 +175,8 @@ Partial Class Main
|
||||
'
|
||||
'MetroStyleManager1
|
||||
'
|
||||
Me.MetroStyleManager1.Owner = Nothing
|
||||
Me.MetroStyleManager1.Owner = Me
|
||||
Me.MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Orange
|
||||
'
|
||||
'PictureBox1
|
||||
'
|
||||
@ -240,6 +241,6 @@ Partial Class Main
|
||||
Friend WithEvents TheTextBox As RichTextBox
|
||||
Friend WithEvents PictureBox6 As PictureBox
|
||||
Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender
|
||||
Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager
|
||||
Friend WithEvents PictureBox1 As PictureBox
|
||||
Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager
|
||||
End Class
|
||||
|
||||
@ -118,19 +118,19 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
<value>182, 17</value>
|
||||
</metadata>
|
||||
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>116, 17</value>
|
||||
<value>281, 17</value>
|
||||
</metadata>
|
||||
<metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>205, 17</value>
|
||||
<value>370, 17</value>
|
||||
</metadata>
|
||||
<metadata name="Timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>294, 17</value>
|
||||
<value>459, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>383, 17</value>
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MetroStyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>548, 17</value>
|
||||
|
||||
@ -13,6 +13,13 @@ Imports MetroFramework.Components
|
||||
Public Class Main
|
||||
Inherits MetroForm
|
||||
|
||||
Public Manager As New MetroStyleManager
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Public ErrorTolerance As Integer = 0
|
||||
Public liList As New List(Of String)
|
||||
Public HTMLString As String = My.Resources.Startuphtml
|
||||
@ -241,6 +248,7 @@ Public Class Main
|
||||
Private Sub Form8_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Dim tbtl As TextBoxTraceListener = New TextBoxTraceListener(TheTextBox)
|
||||
Debug.Listeners.Add(tbtl)
|
||||
|
||||
'Try
|
||||
' Dim SettingsDone As Boolean = False
|
||||
' Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
|
||||
@ -248,9 +256,13 @@ Public Class Main
|
||||
'Catch ex As Exception
|
||||
' FirstStartup.ShowDialog()
|
||||
'End Try
|
||||
MetroStyleManager1.Style = MetroColorStyle.Orange
|
||||
'Dim Style As New MetroStyleManager
|
||||
|
||||
Manager.Style = MetroColorStyle.Orange
|
||||
Manager.Theme = MetroThemeStyle.Light
|
||||
Me.StyleManager = Manager
|
||||
Manager.Owner = Me
|
||||
|
||||
Me.StyleManager = MetroStyleManager1
|
||||
|
||||
Try
|
||||
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
|
||||
@ -537,7 +549,7 @@ Public Class Main
|
||||
Dim Thumbnail As Image = My.Resources.main_del
|
||||
Try
|
||||
Dim wc As New WebClient()
|
||||
wc.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0")
|
||||
wc.Headers.Add(My.Resources.ffmpeg_user_agend)
|
||||
Dim bytes As Byte() = wc.DownloadData(ThumbnialURL)
|
||||
Dim ms As New MemoryStream(bytes)
|
||||
Thumbnail = System.Drawing.Image.FromStream(ms)
|
||||
@ -1351,7 +1363,7 @@ Public Class Main
|
||||
End Try
|
||||
End If
|
||||
|
||||
Pfad2 = Chr(34) + Pfad2 + "\" + CR_FilenName + ".mp4" + Chr(34)
|
||||
Pfad2 = Chr(34) + Pfad2 + CR_FilenName + ".mp4" + Chr(34)
|
||||
|
||||
#End Region
|
||||
#Region "Subs"
|
||||
@ -2094,8 +2106,8 @@ Public Class Main
|
||||
End If
|
||||
|
||||
|
||||
Dim DefaultPath As String = Pfad + "\" + DefaultName + ".mp4"
|
||||
DefaultPath = DefaultPath.Replace("\\", "\")
|
||||
'Dim DefaultPath As String = Pfad + "\" + DefaultName + ".mp4"
|
||||
'DefaultPath = DefaultPath.Replace("\\", "\")
|
||||
#End Region
|
||||
|
||||
#Region "Pfad"
|
||||
@ -2116,7 +2128,7 @@ Public Class Main
|
||||
|
||||
|
||||
|
||||
DownloadPfad = UseSubfolder(FunimationTitle, FunimationEpisode, Pfad)
|
||||
DownloadPfad = UseSubfolder(FunimationTitle, FunimationSeason, Pfad)
|
||||
|
||||
If Not Directory.Exists(Path.GetDirectoryName(DownloadPfad)) Then
|
||||
' Nein! Jetzt erstellen...
|
||||
@ -2443,10 +2455,12 @@ Public Class Main
|
||||
Else
|
||||
ffmpeg_hardsub = ffmpeg_command
|
||||
End If
|
||||
|
||||
'MsgBox(HardSubSplittString)
|
||||
Dim HardSubTitle() As String = PlayerPage.Split(New String() {HardSubSplittString}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim HardSubTitle2() As String = HardSubTitle(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
UsedSub = HardSubTitle2(0)
|
||||
|
||||
UsedSub = HardSubTitle2(HardSubTitle2.Count - 1)
|
||||
'MsgBox(UsedSub)
|
||||
Dim SubText As String = client0.DownloadString(UsedSub)
|
||||
Dim SubtitelFormat As String = ".srt"
|
||||
If InStr(UsedSub, ".vtt") Then
|
||||
@ -2526,7 +2540,7 @@ Public Class Main
|
||||
For i As Integer = 0 To UsedSubs.Count - 1
|
||||
Dim SoftSub As String() = UsedSubs.Item(i).Split(New String() {" , "}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
If SoftSubMergeURLs = Nothing Then
|
||||
SoftSubMergeURLs = " -i " + Chr(34) + SoftSub(0) + Chr(34)
|
||||
SoftSubMergeURLs = " -headers " + My.Resources.ffmpeg_user_agend + " -i " + Chr(34) + SoftSub(0) + Chr(34)
|
||||
Else
|
||||
SoftSubMergeURLs = SoftSubMergeURLs + " -i " + Chr(34) + SoftSub(0) + Chr(34)
|
||||
End If
|
||||
@ -3055,45 +3069,11 @@ Public Class Main
|
||||
End If
|
||||
End Function
|
||||
|
||||
Private Sub ListView1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListView1.SelectedIndexChanged
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ListView1_RegionChanged(sender As Object, e As EventArgs) Handles ListView1.RegionChanged
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs)
|
||||
Dim rnd As New Random
|
||||
Dim ZufallsZahl As Integer = rnd.Next(1, 33)
|
||||
|
||||
If ZufallsZahl > 30 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Blue
|
||||
Debug.WriteLine("Blue")
|
||||
ElseIf ZufallsZahl > 25 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Lime
|
||||
Debug.WriteLine("Lime")
|
||||
ElseIf ZufallsZahl > 20 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Magenta
|
||||
Debug.WriteLine("Magenta")
|
||||
ElseIf ZufallsZahl > 15 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Green
|
||||
Debug.WriteLine("Green")
|
||||
ElseIf ZufallsZahl > 10 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Brown
|
||||
Debug.WriteLine("Brown")
|
||||
ElseIf ZufallsZahl > 5 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Purple
|
||||
Debug.WriteLine("Purple")
|
||||
End If
|
||||
ErrorDialog.Show()
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#End Region
|
||||
|
||||
|
||||
|
||||
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.6.3")>
|
||||
<Assembly: AssemblyFileVersion("3.6.3")>
|
||||
<Assembly: AssemblyVersion("3.6.4")>
|
||||
<Assembly: AssemblyFileVersion("3.6.4")>
|
||||
<Assembly: NeutralResourcesLanguage("en")>
|
||||
|
||||
@ -382,7 +382,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0" ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property ffmpeg_user_agend() As String
|
||||
Get
|
||||
|
||||
@ -440,7 +440,7 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
|
||||
<value>..\Resources\crdSettings_Button_SafeExit_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ffmpeg_user_agend" xml:space="preserve">
|
||||
<value>"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0"</value>
|
||||
<value>"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0"</value>
|
||||
</data>
|
||||
<data name="crdSettings_Button_SafeExit" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\crdSettings_Button_SafeExit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
|
||||
Public Function UseSubfolder(ByVal Series As String, ByVal Season As String, ByVal Path As String)
|
||||
Dim newPath As String = Path
|
||||
Dim newPath As String = Path + "\"
|
||||
|
||||
If SubFolder_Value = SubFolder_automatic Then
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -202,7 +202,7 @@ Video Position: 0
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_user_agend">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" ähnelt.
|
||||
Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Player_ID">
|
||||
|
||||
Binary file not shown.
Binary file not shown.
10
Crunchyroll Downloader/einstellungen.Designer.vb
generated
10
Crunchyroll Downloader/einstellungen.Designer.vb
generated
@ -131,8 +131,6 @@ Partial Class Einstellungen
|
||||
Me.Label4 = New System.Windows.Forms.Label()
|
||||
Me.Label6 = New System.Windows.Forms.Label()
|
||||
Me.Label5 = New System.Windows.Forms.Label()
|
||||
Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components)
|
||||
Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components)
|
||||
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.TabPage4.SuspendLayout()
|
||||
@ -171,7 +169,6 @@ Partial Class Einstellungen
|
||||
Me.TabPage7.SuspendLayout()
|
||||
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.Panel2.SuspendLayout()
|
||||
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'ToolTip1
|
||||
@ -1449,10 +1446,6 @@ Partial Class Einstellungen
|
||||
Me.Label5.Text = "Created by hama3254"
|
||||
Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
|
||||
'
|
||||
'MetroStyleManager1
|
||||
'
|
||||
Me.MetroStyleManager1.Owner = Me
|
||||
'
|
||||
'Einstellungen
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@ -1522,7 +1515,6 @@ Partial Class Einstellungen
|
||||
Me.TabPage7.ResumeLayout(False)
|
||||
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.Panel2.ResumeLayout(False)
|
||||
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ResumeLayout(False)
|
||||
Me.PerformLayout()
|
||||
|
||||
@ -1603,8 +1595,6 @@ Partial Class Einstellungen
|
||||
Private WithEvents TabPage1 As MetroFramework.Controls.MetroTabPage
|
||||
Private WithEvents TabControl1 As MetroFramework.Controls.MetroTabControl
|
||||
Private WithEvents TabPage6 As MetroFramework.Controls.MetroTabPage
|
||||
Private WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager
|
||||
Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender
|
||||
Friend WithEvents TabPage7 As TabPage
|
||||
Friend WithEvents Panel2 As Panel
|
||||
Public WithEvents Label8 As Label
|
||||
|
||||
@ -126,13 +126,10 @@
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>282, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MetroStyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>282, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>60</value>
|
||||
</metadata>
|
||||
<metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>496, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@ -12,10 +12,11 @@ Public Class Einstellungen
|
||||
Inherits MetroForm
|
||||
Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Label6.Text = "Version " + Application.ProductVersion.ToString
|
||||
MetroStyleManager1.Style = MetroColorStyle.Orange
|
||||
'MetroStyleManager1.Theme = MetroThemeStyle.Dark
|
||||
Dim Manager As MetroStyleManager = Main.Manager
|
||||
Manager.Owner = Me
|
||||
|
||||
|
||||
TabControl1.SelectedIndex = 0
|
||||
Me.StyleManager = MetroStyleManager1
|
||||
For i As Integer = 0 To Main.SoftSubs.Count - 1
|
||||
If Main.SoftSubs(i) = "deDE" Then
|
||||
CBdeDE.Checked = True
|
||||
@ -772,30 +773,6 @@ Public Class Einstellungen
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs)
|
||||
Dim rnd As New Random
|
||||
Dim ZufallsZahl As Integer = rnd.Next(1, 33)
|
||||
|
||||
If ZufallsZahl > 30 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Blue
|
||||
Debug.WriteLine("Blue")
|
||||
ElseIf ZufallsZahl > 25 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Lime
|
||||
Debug.WriteLine("Lime")
|
||||
ElseIf ZufallsZahl > 20 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Magenta
|
||||
Debug.WriteLine("Magenta")
|
||||
ElseIf ZufallsZahl > 15 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Green
|
||||
Debug.WriteLine("Green")
|
||||
ElseIf ZufallsZahl > 10 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Brown
|
||||
Debug.WriteLine("Brown")
|
||||
ElseIf ZufallsZahl > 5 Then
|
||||
MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Purple
|
||||
Debug.WriteLine("Purple")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
9a55c6ae258daebcde0ebd975ccb9d9cb40e83cc
|
||||
237c9b2a5286ec54ed4b5347c70a9d9c9eff3d81
|
||||
|
||||
@ -114,7 +114,6 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crun
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.exe
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.xml
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.pdb
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.FirstStartup.resources
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.exe.config
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.exe
|
||||
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.pdb
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -202,7 +202,7 @@ Video Position: 0
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_user_agend">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" ähnelt.
|
||||
Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Player_ID">
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user