mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-11-14 20:25:06 +01:00
UI and add-on improvements
UI and add-on improvements
This commit is contained in:
hama3254
parent
f52cdce053
commit
95ad6b3bdb
Binary file not shown.
34
Crunchyroll Downloader/Anime_Add.Designer.vb
generated
34
Crunchyroll Downloader/Anime_Add.Designer.vb
generated
@ -33,10 +33,10 @@ Partial Class Anime_Add
|
||||
Me.textBox1 = New MetroFramework.Controls.MetroTextBox()
|
||||
Me.TextBox2 = New MetroFramework.Controls.MetroTextBox()
|
||||
Me.groupBox2 = New System.Windows.Forms.GroupBox()
|
||||
Me.bt_Cancel_mass = New System.Windows.Forms.Button()
|
||||
Me.comboBox4 = New MetroFramework.Controls.MetroComboBox()
|
||||
Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox()
|
||||
Me.comboBox3 = New MetroFramework.Controls.MetroComboBox()
|
||||
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
|
||||
Me.Add_Display = New MetroFramework.Controls.MetroLabel()
|
||||
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
|
||||
Me.ListBox1 = New System.Windows.Forms.ListBox()
|
||||
@ -49,7 +49,6 @@ Partial Class Anime_Add
|
||||
Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
|
||||
Me.groupBox1.SuspendLayout()
|
||||
Me.groupBox2.SuspendLayout()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.GroupBox3.SuspendLayout()
|
||||
CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -230,10 +229,10 @@ Partial Class Anime_Add
|
||||
'groupBox2
|
||||
'
|
||||
Me.groupBox2.BackColor = System.Drawing.Color.Transparent
|
||||
Me.groupBox2.Controls.Add(Me.bt_Cancel_mass)
|
||||
Me.groupBox2.Controls.Add(Me.comboBox4)
|
||||
Me.groupBox2.Controls.Add(Me.ComboBox1)
|
||||
Me.groupBox2.Controls.Add(Me.comboBox3)
|
||||
Me.groupBox2.Controls.Add(Me.PictureBox1)
|
||||
Me.groupBox2.Controls.Add(Me.Add_Display)
|
||||
Me.groupBox2.Location = New System.Drawing.Point(15, 70)
|
||||
Me.groupBox2.Name = "groupBox2"
|
||||
@ -242,6 +241,20 @@ Partial Class Anime_Add
|
||||
Me.groupBox2.TabStop = False
|
||||
Me.groupBox2.Visible = False
|
||||
'
|
||||
'bt_Cancel_mass
|
||||
'
|
||||
Me.bt_Cancel_mass.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.add_mass_cancel
|
||||
Me.bt_Cancel_mass.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
|
||||
Me.bt_Cancel_mass.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.bt_Cancel_mass.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.bt_Cancel_mass.ForeColor = System.Drawing.SystemColors.Control
|
||||
Me.bt_Cancel_mass.Location = New System.Drawing.Point(159, 231)
|
||||
Me.bt_Cancel_mass.Name = "bt_Cancel_mass"
|
||||
Me.bt_Cancel_mass.Size = New System.Drawing.Size(403, 36)
|
||||
Me.bt_Cancel_mass.TabIndex = 37
|
||||
Me.bt_Cancel_mass.Text = "Cancel"
|
||||
Me.bt_Cancel_mass.UseVisualStyleBackColor = True
|
||||
'
|
||||
'comboBox4
|
||||
'
|
||||
Me.comboBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
@ -275,18 +288,6 @@ Partial Class Anime_Add
|
||||
Me.comboBox3.TabIndex = 1
|
||||
Me.comboBox3.UseSelectable = True
|
||||
'
|
||||
'PictureBox1
|
||||
'
|
||||
Me.PictureBox1.BackColor = System.Drawing.Color.Transparent
|
||||
Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Hand
|
||||
Me.PictureBox1.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.add_mass_cancel
|
||||
Me.PictureBox1.Location = New System.Drawing.Point(159, 231)
|
||||
Me.PictureBox1.Name = "PictureBox1"
|
||||
Me.PictureBox1.Size = New System.Drawing.Size(403, 36)
|
||||
Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
|
||||
Me.PictureBox1.TabIndex = 45
|
||||
Me.PictureBox1.TabStop = False
|
||||
'
|
||||
'Add_Display
|
||||
'
|
||||
Me.Add_Display.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
|
||||
@ -401,7 +402,6 @@ Partial Class Anime_Add
|
||||
Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center
|
||||
Me.groupBox1.ResumeLayout(False)
|
||||
Me.groupBox2.ResumeLayout(False)
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.GroupBox3.ResumeLayout(False)
|
||||
CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
@ -409,7 +409,6 @@ Partial Class Anime_Add
|
||||
|
||||
End Sub
|
||||
Public WithEvents groupBox2 As GroupBox
|
||||
Public WithEvents PictureBox1 As PictureBox
|
||||
Public WithEvents groupBox1 As GroupBox
|
||||
Public WithEvents GroupBox3 As GroupBox
|
||||
Friend WithEvents Timer1 As Timer
|
||||
@ -431,4 +430,5 @@ Partial Class Anime_Add
|
||||
Friend WithEvents btn_dl As Button
|
||||
Friend WithEvents Timer3 As Timer
|
||||
Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
|
||||
Friend WithEvents bt_Cancel_mass As Button
|
||||
End Class
|
||||
|
||||
@ -127,7 +127,7 @@
|
||||
<data name="Btn_min.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
||||
wwAADsMBx2+oZAAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa
|
||||
wQAADsEBuJFr7QAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa
|
||||
CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
|
||||
@ -22,6 +22,8 @@ Public Class Anime_Add
|
||||
|
||||
|
||||
Private Sub LoadBrowser(ByVal Url As String)
|
||||
|
||||
|
||||
Dim locale As String = "en-US"
|
||||
If CBool(InStr(Url, "beta.crunchyroll.com")) = True And CBool(InStr(Url, "watch")) = True And CBool(Main.CrBetaBasic = Nothing) = False Then
|
||||
#Region "Get Cookies"
|
||||
@ -440,8 +442,8 @@ Public Class Anime_Add
|
||||
'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel
|
||||
btn_dl.Text = "Cancel"
|
||||
Mass_DL_Cancel = True
|
||||
PictureBox1.Enabled = False
|
||||
PictureBox1.Visible = False
|
||||
bt_Cancel_mass.Enabled = False
|
||||
bt_Cancel_mass.Visible = False
|
||||
Main.DownloadFunimationJS_Seasons()
|
||||
comboBox4.Enabled = False
|
||||
comboBox3.Enabled = False
|
||||
@ -453,8 +455,8 @@ Public Class Anime_Add
|
||||
'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel
|
||||
btn_dl.Text = "Cancel"
|
||||
Mass_DL_Cancel = True
|
||||
PictureBox1.Enabled = False
|
||||
PictureBox1.Visible = False
|
||||
bt_Cancel_mass.Enabled = False
|
||||
bt_Cancel_mass.Visible = False
|
||||
|
||||
Main.DownloadBetaSeasons()
|
||||
comboBox4.Enabled = False
|
||||
@ -466,8 +468,8 @@ Public Class Anime_Add
|
||||
'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel
|
||||
btn_dl.Text = "Cancel"
|
||||
Mass_DL_Cancel = True
|
||||
PictureBox1.Enabled = False
|
||||
PictureBox1.Visible = False
|
||||
bt_Cancel_mass.Enabled = False
|
||||
bt_Cancel_mass.Visible = False
|
||||
|
||||
Main.Download_VRV_Seasons()
|
||||
comboBox4.Enabled = False
|
||||
@ -480,8 +482,8 @@ Public Class Anime_Add
|
||||
'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel
|
||||
btn_dl.Text = "Cancel"
|
||||
Mass_DL_Cancel = True
|
||||
PictureBox1.Enabled = False
|
||||
PictureBox1.Visible = False
|
||||
bt_Cancel_mass.Enabled = False
|
||||
bt_Cancel_mass.Visible = False
|
||||
Main.MassDL()
|
||||
comboBox4.Enabled = False
|
||||
comboBox3.Enabled = False
|
||||
@ -577,11 +579,23 @@ Public Class Anime_Add
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
|
||||
|
||||
Private Sub bt_Cancel_mass_Click(sender As Object, e As EventArgs) Handles bt_Cancel_mass.Click
|
||||
groupBox1.Visible = True
|
||||
groupBox2.Visible = False
|
||||
End Sub
|
||||
|
||||
Private Sub bt_Cancel_mass_MouseEnter(sender As Object, e As EventArgs) Handles bt_Cancel_mass.MouseEnter
|
||||
|
||||
bt_Cancel_mass.BackgroundImage = My.Resources.add_mass_cancel_hover
|
||||
|
||||
|
||||
End Sub
|
||||
Private Sub bt_Cancel_mass_MouseLeave(sender As Object, e As EventArgs) Handles bt_Cancel_mass.MouseLeave
|
||||
bt_Cancel_mass.BackgroundImage = My.Resources.add_mass_cancel
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
|
||||
If CBool(InStr(Main.WebbrowserURL, "beta.crunchyroll.com")) = True Then
|
||||
comboBox3.Items.Clear()
|
||||
@ -629,6 +643,14 @@ Public Class Anime_Add
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
If comboBox3.Items.Count > 0 Then
|
||||
comboBox3.SelectedIndex = 0
|
||||
comboBox4.SelectedIndex = comboBox4.Items.Count - 1
|
||||
End If
|
||||
|
||||
|
||||
|
||||
ElseIf CBool(InStr(Main.WebbrowserURL, "vrv.co")) = True Then
|
||||
comboBox3.Items.Clear()
|
||||
comboBox4.Items.Clear()
|
||||
@ -675,6 +697,12 @@ Public Class Anime_Add
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
If comboBox3.Items.Count > 0 Then
|
||||
comboBox3.SelectedIndex = 0
|
||||
comboBox4.SelectedIndex = comboBox4.Items.Count - 1
|
||||
End If
|
||||
|
||||
ElseIf Main.WebbrowserURL = "https://funimation.com/js" Then
|
||||
comboBox3.Items.Clear()
|
||||
comboBox4.Items.Clear()
|
||||
@ -719,6 +747,11 @@ Public Class Anime_Add
|
||||
FillFunimationEpisodes(EpisodeJson)
|
||||
|
||||
|
||||
If comboBox3.Items.Count > 0 Then
|
||||
comboBox3.SelectedIndex = 0
|
||||
comboBox4.SelectedIndex = comboBox4.Items.Count - 1
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
|
||||
@ -751,6 +784,11 @@ Public Class Anime_Add
|
||||
comboBox4.Items.Add(URLGrapp2(0))
|
||||
Next
|
||||
|
||||
If comboBox3.Items.Count > 0 Then
|
||||
comboBox3.SelectedIndex = 0
|
||||
comboBox4.SelectedIndex = comboBox4.Items.Count - 1
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
End Sub
|
||||
@ -772,13 +810,7 @@ Public Class Anime_Add
|
||||
Next
|
||||
Main.WebbrowserURL = "https://funimation.com/js"
|
||||
End Sub
|
||||
Private Sub PictureBox1_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox1.MouseEnter
|
||||
PictureBox1.Image = My.Resources.add_mass_cancel_hover
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox1.MouseLeave
|
||||
PictureBox1.Image = My.Resources.add_mass_cancel
|
||||
End Sub
|
||||
|
||||
Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
|
||||
If ListBox1.Items.Count > 0 Then
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
<probing privatePath="lib" />
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-101.0.150.0" newVersion="101.0.150.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-103.0.90.0" newVersion="103.0.90.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CefSharp.Core" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-101.0.150.0" newVersion="101.0.150.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-103.0.90.0" newVersion="103.0.90.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@ -30,6 +30,7 @@ Public Class CRD_List_Item
|
||||
|
||||
Dim TempFolder As String = Nothing
|
||||
Dim DownloadPfad As String = Nothing
|
||||
Dim ThumbnailSource As String = Nothing
|
||||
Dim ToDispose As Boolean = False
|
||||
Dim Failed As Boolean = False
|
||||
Dim FailedCount As Integer = 0
|
||||
@ -136,7 +137,18 @@ Public Class CRD_List_Item
|
||||
Public Sub SetLabelPercent(ByVal Text As String)
|
||||
Label_percent.Text = Text
|
||||
End Sub
|
||||
Public Sub SetThumbnailImage(ByVal Thumbnail As Image)
|
||||
Public Sub SetThumbnailImage(ByVal ThumbnialURL As String)
|
||||
ThumbnailSource = ThumbnialURL
|
||||
Dim Thumbnail As Image = My.Resources.main_del
|
||||
Debug.WriteLine("ThumbnialURL: " + ThumbnialURL)
|
||||
Try
|
||||
Dim wc As New WebClient()
|
||||
Dim bytes As Byte() = wc.DownloadData(ThumbnialURL)
|
||||
Dim ms As New MemoryStream(bytes)
|
||||
Thumbnail = System.Drawing.Image.FromStream(ms)
|
||||
Catch ex As Exception
|
||||
'MsgBox(ex.ToString)
|
||||
End Try
|
||||
PB_Thumbnail.BackgroundImage = Thumbnail
|
||||
End Sub
|
||||
#End Region
|
||||
@ -157,6 +169,14 @@ Public Class CRD_List_Item
|
||||
End If
|
||||
End If
|
||||
|
||||
End Function
|
||||
Public Function GetThumbnailSource() As String
|
||||
Try
|
||||
Return ThumbnailSource
|
||||
Catch ex As Exception
|
||||
Return "0"
|
||||
End Try
|
||||
|
||||
End Function
|
||||
Public Function GetLabelPercent() As String
|
||||
Try
|
||||
@ -522,6 +542,15 @@ Public Class CRD_List_Item
|
||||
#Region "ThreadChecker"
|
||||
|
||||
Private Sub CheckThreadCount()
|
||||
'Try
|
||||
' Me.Invoke(New Action(Function() As Object
|
||||
|
||||
' Label_Reso.Text = ThreadList.Count.ToString
|
||||
' Return Nothing
|
||||
' End Function))
|
||||
'Catch ex As Exception
|
||||
'End Try
|
||||
|
||||
For w As Integer = 0 To Integer.MaxValue
|
||||
|
||||
If StatusRunning = False Then
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.101.0.18\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.101.0.18\build\cef.redist.x86.props')" />
|
||||
<Import Project="..\packages\cef.redist.x64.101.0.18\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.101.0.18\build\cef.redist.x64.props')" />
|
||||
<Import Project="..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.103.0.9\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.103.0.9\build\cef.redist.x86.props')" />
|
||||
<Import Project="..\packages\cef.redist.x64.103.0.9\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.103.0.9\build\cef.redist.x64.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
@ -105,14 +105,14 @@
|
||||
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp, Version=101.0.180.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.101.0.180\lib\net452\CefSharp.dll</HintPath>
|
||||
<Reference Include="CefSharp, Version=103.0.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.103.0.90\lib\net452\CefSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.Core, Version=101.0.180.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.101.0.180\lib\net452\CefSharp.Core.dll</HintPath>
|
||||
<Reference Include="CefSharp.Core, Version=103.0.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.103.0.90\lib\net452\CefSharp.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.WinForms, Version=101.0.180.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.WinForms.101.0.180\lib\net462\CefSharp.WinForms.dll</HintPath>
|
||||
<Reference Include="CefSharp.WinForms, Version=103.0.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.WinForms.103.0.90\lib\net462\CefSharp.WinForms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a, processorArchitecture=AMD64">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@ -379,9 +379,6 @@
|
||||
<None Include="Resources\main-pause-play.png" />
|
||||
<None Include="Resources\main-pause-hover.png" />
|
||||
<None Include="Resources\main-pause.png" />
|
||||
<None Include="Resources\softsubs_download_hover.png" />
|
||||
<None Include="Resources\softsubs_download_gray.png" />
|
||||
<None Include="Resources\softsubs_download.png" />
|
||||
<None Include="Resources\main-del-hover.png" />
|
||||
<None Include="Resources\main-del.png" />
|
||||
<None Include="Resources\balken.png" />
|
||||
@ -410,10 +407,10 @@
|
||||
<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\cef.redist.x64.101.0.18\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.101.0.18\build\cef.redist.x64.props'))" />
|
||||
<Error Condition="!Exists('..\packages\cef.redist.x86.101.0.18\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.101.0.18\build\cef.redist.x86.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\cef.redist.x64.103.0.9\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.103.0.9\build\cef.redist.x64.props'))" />
|
||||
<Error Condition="!Exists('..\packages\cef.redist.x86.103.0.9\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.103.0.9\build\cef.redist.x86.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.101.0.180\build\CefSharp.Common.targets')" />
|
||||
<Import Project="..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.103.0.90\build\CefSharp.Common.targets')" />
|
||||
</Project>
|
||||
16
Crunchyroll Downloader/Main.designer.vb
generated
16
Crunchyroll Downloader/Main.designer.vb
generated
@ -47,6 +47,8 @@ Partial Class Main
|
||||
Me.OpenSettingsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.TestDownloadToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.CheckCRBetaTokenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.AddonHTMLToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.Timer3OffToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -180,7 +182,7 @@ Partial Class Main
|
||||
'
|
||||
'ContextMenuStrip1
|
||||
'
|
||||
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem})
|
||||
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem})
|
||||
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
|
||||
resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
|
||||
'
|
||||
@ -204,6 +206,16 @@ Partial Class Main
|
||||
Me.CheckCRBetaTokenToolStripMenuItem.Name = "CheckCRBetaTokenToolStripMenuItem"
|
||||
resources.ApplyResources(Me.CheckCRBetaTokenToolStripMenuItem, "CheckCRBetaTokenToolStripMenuItem")
|
||||
'
|
||||
'AddonHTMLToolStripMenuItem
|
||||
'
|
||||
Me.AddonHTMLToolStripMenuItem.Name = "AddonHTMLToolStripMenuItem"
|
||||
resources.ApplyResources(Me.AddonHTMLToolStripMenuItem, "AddonHTMLToolStripMenuItem")
|
||||
'
|
||||
'Timer3OffToolStripMenuItem
|
||||
'
|
||||
Me.Timer3OffToolStripMenuItem.Name = "Timer3OffToolStripMenuItem"
|
||||
resources.ApplyResources(Me.Timer3OffToolStripMenuItem, "Timer3OffToolStripMenuItem")
|
||||
'
|
||||
'Main
|
||||
'
|
||||
Me.ApplyImageInvert = True
|
||||
@ -256,4 +268,6 @@ Partial Class Main
|
||||
Friend WithEvents OpenSettingsToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents TestDownloadToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents CheckCRBetaTokenToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents AddonHTMLToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents Timer3OffToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@ -120,13 +120,6 @@
|
||||
<metadata name="ListView1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="Link.Text" xml:space="preserve">
|
||||
<value>Link</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="Link.Width" type="System.Int32, mscorlib">
|
||||
<value>818</value>
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="ListView1.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Microsoft Sans Serif, 93pt</value>
|
||||
@ -144,6 +137,7 @@
|
||||
<data name="ListView1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>840, 546</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="ListView1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>57</value>
|
||||
</data>
|
||||
@ -159,6 +153,12 @@
|
||||
<data name=">>ListView1.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="Link.Text" xml:space="preserve">
|
||||
<value>Link</value>
|
||||
</data>
|
||||
<data name="Link.Width" type="System.Int32, mscorlib">
|
||||
<value>818</value>
|
||||
</data>
|
||||
<metadata name="PictureBox5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@ -273,24 +273,6 @@
|
||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>842, 630</value>
|
||||
</data>
|
||||
<data name="Btn_Close.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="Btn_Close.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_Close.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_Close.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>800, 1</value>
|
||||
</data>
|
||||
<data name="Btn_Close.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>40, 40</value>
|
||||
</data>
|
||||
<data name="Btn_Close.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name=">>Btn_Close.Name" xml:space="preserve">
|
||||
<value>Btn_Close</value>
|
||||
</data>
|
||||
@ -303,24 +285,6 @@
|
||||
<data name=">>Btn_Close.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="Btn_min.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_min.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_min.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>757, 1</value>
|
||||
</data>
|
||||
<data name="Btn_min.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>40, 40</value>
|
||||
</data>
|
||||
<data name="Btn_min.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name=">>Btn_min.Name" xml:space="preserve">
|
||||
<value>Btn_min</value>
|
||||
</data>
|
||||
@ -333,24 +297,6 @@
|
||||
<data name=">>Btn_min.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>Zoom</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>641, 18</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 35</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>Btn_Settings.Name" xml:space="preserve">
|
||||
<value>Btn_Settings</value>
|
||||
</data>
|
||||
@ -363,21 +309,6 @@
|
||||
<data name=">>Btn_Settings.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="Btn_Browser.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>Zoom</value>
|
||||
</data>
|
||||
<data name="Btn_Browser.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_Browser.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>124, 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=">>Btn_Browser.Name" xml:space="preserve">
|
||||
<value>Btn_Browser</value>
|
||||
</data>
|
||||
@ -390,24 +321,6 @@
|
||||
<data name=">>Btn_Browser.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>Zoom</value>
|
||||
</data>
|
||||
<data name="Btn_add.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_add.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_add.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>11, 18</value>
|
||||
</data>
|
||||
<data name="Btn_add.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 35</value>
|
||||
</data>
|
||||
<data name="Btn_add.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>Btn_add.Name" xml:space="preserve">
|
||||
<value>Btn_add</value>
|
||||
</data>
|
||||
@ -510,6 +423,18 @@
|
||||
<data name=">>CheckCRBetaTokenToolStripMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>AddonHTMLToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>AddonHTMLToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>AddonHTMLToolStripMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>Timer3OffToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>Timer3OffToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>Timer3OffToolStripMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>Main</value>
|
||||
</data>
|
||||
@ -522,9 +447,165 @@
|
||||
<metadata name="Timer4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>877, 17</value>
|
||||
</metadata>
|
||||
<data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>Zoom</value>
|
||||
</data>
|
||||
<data name="Btn_add.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_add.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_add.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>11, 18</value>
|
||||
</data>
|
||||
<data name="Btn_add.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 35</value>
|
||||
</data>
|
||||
<data name="Btn_add.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>Btn_add.Name" xml:space="preserve">
|
||||
<value>Btn_add</value>
|
||||
</data>
|
||||
<data name=">>Btn_add.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>Btn_add.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>Btn_add.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="Btn_Browser.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>Zoom</value>
|
||||
</data>
|
||||
<data name="Btn_Browser.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_Browser.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>124, 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=">>Btn_Browser.Name" xml:space="preserve">
|
||||
<value>Btn_Browser</value>
|
||||
</data>
|
||||
<data name=">>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=">>Btn_Browser.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>Btn_Browser.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>Zoom</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>641, 18</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 35</value>
|
||||
</data>
|
||||
<data name="Btn_Settings.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>Btn_Settings.Name" xml:space="preserve">
|
||||
<value>Btn_Settings</value>
|
||||
</data>
|
||||
<data name=">>Btn_Settings.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>Btn_Settings.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>Btn_Settings.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="Btn_min.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_min.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_min.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>757, 1</value>
|
||||
</data>
|
||||
<data name="Btn_min.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>40, 40</value>
|
||||
</data>
|
||||
<data name="Btn_min.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name=">>Btn_min.Name" xml:space="preserve">
|
||||
<value>Btn_min</value>
|
||||
</data>
|
||||
<data name=">>Btn_min.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>Btn_min.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>Btn_min.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="Btn_Close.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="Btn_Close.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Flat</value>
|
||||
</data>
|
||||
<data name="Btn_Close.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="Btn_Close.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>800, 1</value>
|
||||
</data>
|
||||
<data name="Btn_Close.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>40, 40</value>
|
||||
</data>
|
||||
<data name="Btn_Close.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name=">>Btn_Close.Name" xml:space="preserve">
|
||||
<value>Btn_Close</value>
|
||||
</data>
|
||||
<data name=">>Btn_Close.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>Btn_Close.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>Btn_Close.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>966, 17</value>
|
||||
</metadata>
|
||||
<data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>206, 136</value>
|
||||
</data>
|
||||
<data name=">>ContextMenuStrip1.Name" xml:space="preserve">
|
||||
<value>ContextMenuStrip1</value>
|
||||
</data>
|
||||
<data name=">>ContextMenuStrip1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="ToggleDebugModeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>205, 22</value>
|
||||
</data>
|
||||
@ -549,13 +630,16 @@
|
||||
<data name="CheckCRBetaTokenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Check CR Beta Token</value>
|
||||
</data>
|
||||
<data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>206, 92</value>
|
||||
<data name="AddonHTMLToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>205, 22</value>
|
||||
</data>
|
||||
<data name=">>ContextMenuStrip1.Name" xml:space="preserve">
|
||||
<value>ContextMenuStrip1</value>
|
||||
<data name="AddonHTMLToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Add-on HTML</value>
|
||||
</data>
|
||||
<data name=">>ContextMenuStrip1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<data name="Timer3OffToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>205, 22</value>
|
||||
</data>
|
||||
<data name="Timer3OffToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Timer3 off</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -47,7 +47,7 @@ Public Class Main
|
||||
Dim ServerThread As Thread
|
||||
Public KodiNaming As Boolean = False
|
||||
Public ErrorTolerance As Integer = 0
|
||||
Public liList As New List(Of String)
|
||||
'Public liList As New List(Of String)
|
||||
Public HTMLString As String = My.Resources.Startuphtml
|
||||
Public ListBoxList As New List(Of String)
|
||||
Public ItemList As New List(Of CRD_List_Item)
|
||||
@ -676,22 +676,13 @@ Public Class Main
|
||||
End Sub
|
||||
|
||||
Public Sub ListItemAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, Optional Service As String = "CR") ', ByVal AudioLang As String)
|
||||
Dim Thumbnail As Image = My.Resources.main_del
|
||||
Debug.WriteLine("ThumbnialURL: " + ThumbnialURL)
|
||||
Try
|
||||
Dim wc As New WebClient()
|
||||
Dim bytes As Byte() = wc.DownloadData(ThumbnialURL)
|
||||
Dim ms As New MemoryStream(bytes)
|
||||
Thumbnail = System.Drawing.Image.FromStream(ms)
|
||||
Catch ex As Exception
|
||||
'MsgBox(ex.ToString)
|
||||
End Try
|
||||
|
||||
With ListView1.Items.Add("0")
|
||||
ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, SoftSubs, Thumbnail, URL_DL, Pfad_DL, Service)
|
||||
ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, SoftSubs, ThumbnialURL, URL_DL, Pfad_DL, Service)
|
||||
End With
|
||||
End Sub
|
||||
|
||||
Public Sub ItemConstructor(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal Thumbnail As Image, ByVal URL_DL As String, ByVal Pfad_DL As String, ByVal Service As String)
|
||||
Public Sub ItemConstructor(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, ByVal Service As String)
|
||||
Dim Item As New CRD_List_Item
|
||||
Item.Visible = False
|
||||
Item.Parent = ListView1
|
||||
@ -716,7 +707,7 @@ Public Class Main
|
||||
Item.SetLabelAnimeTitel(NameP2)
|
||||
Item.SetLabelResolution(DisplayReso)
|
||||
Item.SetLabelHardsub(HardSub)
|
||||
Item.SetThumbnailImage(Thumbnail)
|
||||
Item.SetThumbnailImage(ThumbnialURL)
|
||||
Item.SetLabelPercent("0%")
|
||||
Item.SetToolTip("Softsubs: " + SoftSubs)
|
||||
'MsgBox(Item.GetTextBound.ToString)
|
||||
@ -742,23 +733,12 @@ Public Class Main
|
||||
|
||||
#Region "Manga DL"
|
||||
Public Sub MangaListItemAdd(ByVal NameP2 As String, ByVal ThumbnialURL As String, ByVal BaseURL As String, ByVal SiteList As List(Of String))
|
||||
Dim Thumbnail As Image = My.Resources.main_del
|
||||
Try
|
||||
Dim wc As New WebClient()
|
||||
wc.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), ""))
|
||||
Dim bytes As Byte() = wc.DownloadData(ThumbnialURL)
|
||||
Dim ms As New MemoryStream(bytes)
|
||||
Thumbnail = System.Drawing.Image.FromStream(ms)
|
||||
Catch ex As Exception
|
||||
'MsgBox(ex.ToString)
|
||||
'MsgBox(ThumbnialURL)
|
||||
End Try
|
||||
With ListView1.Items.Add("0")
|
||||
MangaItemConstructor("proxer.me", NameP2, Thumbnail, BaseURL, SiteList)
|
||||
MangaItemConstructor("proxer.me", NameP2, ThumbnialURL, BaseURL, SiteList)
|
||||
End With
|
||||
End Sub
|
||||
|
||||
Public Sub MangaItemConstructor(ByVal NameP1 As String, ByVal NameP2 As String, ByVal Thumbnail As Image, ByVal BaseURL As String, ByVal SiteList As List(Of String))
|
||||
Public Sub MangaItemConstructor(ByVal NameP1 As String, ByVal NameP2 As String, ByVal ThumbnialURL As String, ByVal BaseURL As String, ByVal SiteList As List(Of String))
|
||||
Dim Item As New CRD_List_Item
|
||||
Item.Visible = False
|
||||
Item.Parent = ListView1
|
||||
@ -776,7 +756,7 @@ Public Class Main
|
||||
Item.SetLabelAnimeTitel(NameP2)
|
||||
Item.SetLabelResolution("Manga")
|
||||
Item.SetLabelHardsub("Manga")
|
||||
Item.SetThumbnailImage(Thumbnail)
|
||||
Item.SetThumbnailImage(ThumbnialURL)
|
||||
Item.SetLabelPercent("0%")
|
||||
'MsgBox(Item.GetTextBound.ToString)
|
||||
ItemList.Add(Item)
|
||||
@ -791,8 +771,8 @@ Public Class Main
|
||||
#Region "Season DL"
|
||||
Public Sub MassGrapp()
|
||||
Anime_Add.groupBox2.Visible = True
|
||||
Anime_Add.PictureBox1.Enabled = True
|
||||
Anime_Add.PictureBox1.Visible = True
|
||||
Anime_Add.bt_Cancel_mass.Enabled = True
|
||||
Anime_Add.bt_Cancel_mass.Visible = True
|
||||
Anime_Add.groupBox1.Visible = False
|
||||
Anime_Add.ComboBox1.Items.Clear()
|
||||
Anime_Add.comboBox3.Items.Clear()
|
||||
@ -821,8 +801,8 @@ Public Class Main
|
||||
|
||||
Public Sub SeasonDropdownGrapp()
|
||||
Anime_Add.groupBox2.Visible = True
|
||||
Anime_Add.PictureBox1.Enabled = True
|
||||
Anime_Add.PictureBox1.Visible = True
|
||||
Anime_Add.bt_Cancel_mass.Enabled = True
|
||||
Anime_Add.bt_Cancel_mass.Visible = True
|
||||
Anime_Add.groupBox1.Visible = False
|
||||
Anime_Add.ComboBox1.Items.Clear()
|
||||
Anime_Add.comboBox3.Items.Clear()
|
||||
@ -1575,7 +1555,7 @@ Public Class Main
|
||||
ListItemAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL)
|
||||
Return Nothing
|
||||
End Function))
|
||||
liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + " <br> " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + " <br> " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + " <br> " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->"
|
||||
#End Region
|
||||
Grapp_RDY = True
|
||||
@ -1696,8 +1676,8 @@ Public Class Main
|
||||
|
||||
Public Sub GetBetaSeasons(ByVal JsonUrl As String)
|
||||
Anime_Add.groupBox2.Visible = True
|
||||
Anime_Add.PictureBox1.Enabled = True
|
||||
Anime_Add.PictureBox1.Visible = True
|
||||
Anime_Add.bt_Cancel_mass.Enabled = True
|
||||
Anime_Add.bt_Cancel_mass.Visible = True
|
||||
Anime_Add.groupBox1.Visible = False
|
||||
Anime_Add.ComboBox1.Items.Clear()
|
||||
Anime_Add.comboBox3.Items.Clear()
|
||||
@ -2273,7 +2253,7 @@ Public Class Main
|
||||
ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL)
|
||||
Return Nothing
|
||||
End Function))
|
||||
liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + " <br> " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->"
|
||||
#End Region
|
||||
Grapp_RDY = True
|
||||
@ -2359,9 +2339,9 @@ Public Class Main
|
||||
Dim ffmpeg_command_Builder() As String = ffmpeg_command.Split(New String() {"-c:a copy"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
ffmpeg_command_temp = "-c:a copy" + ffmpeg_command_Builder(1)
|
||||
End If
|
||||
Dim CR_Streams As New List(Of CR_Beta_Stream)
|
||||
Dim CR_series_title As String = Nothing
|
||||
Dim CR_season_number As String = Nothing
|
||||
Dim CR_season_number2 As String = Nothing
|
||||
Dim CR_episode As String = Nothing
|
||||
Dim CR_Anime_Staffel_int As String = Nothing
|
||||
Dim CR_episode_int As String = Nothing
|
||||
@ -2431,11 +2411,8 @@ Public Class Main
|
||||
'My.Computer.Clipboard.SetText(ObjectJson)
|
||||
'
|
||||
CR_Anime_Staffel_int = CR_season_number
|
||||
If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then
|
||||
CR_season_number = Nothing
|
||||
ElseIf IgnoreSeason = 2 Then
|
||||
CR_season_number = Nothing
|
||||
End If
|
||||
|
||||
|
||||
CR_episode_int = CR_episode
|
||||
If Season_Prefix = "[default season prefix]" Then
|
||||
If CR_episode = Nothing Then 'no episode number means most likey a movie
|
||||
@ -2452,6 +2429,17 @@ Public Class Main
|
||||
CR_season_number = Season_Prefix + CR_season_number
|
||||
End If
|
||||
End If
|
||||
|
||||
CR_season_number2 = CR_season_number
|
||||
|
||||
|
||||
If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then
|
||||
CR_season_number = Nothing
|
||||
ElseIf IgnoreSeason = 2 Then
|
||||
CR_season_number = Nothing
|
||||
End If
|
||||
|
||||
|
||||
If CR_episode = Nothing Then
|
||||
ElseIf Episode_Prefix = "[default episode prefix]" Then
|
||||
CR_episode = "Episode " + AddLeadingZeros(CR_episode)
|
||||
@ -2513,7 +2501,7 @@ Public Class Main
|
||||
CR_FilenName = String.Join(" ", CR_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ")
|
||||
CR_FilenName = RemoveExtraSpaces(CR_FilenName)
|
||||
'My.Computer.FileSystem.WriteAllText("log.log", WebbrowserText, False)
|
||||
Pfad2 = UseSubfolder(CR_series_title, CR_season_number, Pfad)
|
||||
Pfad2 = UseSubfolder(CR_series_title, CR_season_number2, Pfad)
|
||||
If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
|
||||
' Nein! Jetzt erstellen...
|
||||
Try
|
||||
@ -2540,7 +2528,19 @@ Public Class Main
|
||||
Debug.WriteLine("error- getting stream data")
|
||||
Exit Sub
|
||||
End Try
|
||||
|
||||
Dim hls_type As String = Nothing
|
||||
If CBool(InStr(VideoJson, Chr(34) + "adaptive_hls")) = True Then
|
||||
hls_type = "adaptive_hls"
|
||||
ElseIf CBool(InStr(VideoJson, Chr(34) + "multitrack_adaptive_hls_v2")) = True Then
|
||||
hls_type = "multitrack_adaptive_hls_v2"
|
||||
ElseIf CBool(InStr(VideoJson, Chr(34) + "vo_adaptive_hls")) = True Then
|
||||
hls_type = "vo_adaptive_hls"
|
||||
Else
|
||||
MsgBox("No download stream avalible", MsgBoxStyle.Critical)
|
||||
Exit Sub
|
||||
End If
|
||||
'My.Computer.Clipboard.SetText(VideoJson)
|
||||
'MsgBox(SubSprache)
|
||||
Dim LangNew As String = ConvertCC(SubSprache)
|
||||
#End Region
|
||||
#Region "Download softsub file or build ffmpeg cmd"
|
||||
@ -2617,62 +2617,50 @@ Public Class Main
|
||||
End If
|
||||
#End Region
|
||||
#Region "m3u8 suche"
|
||||
|
||||
VideoJson = CleanJSON(VideoJson)
|
||||
Dim VideoJObject As JObject = JObject.Parse(VideoJson)
|
||||
Dim VideoData As List(Of JToken) = VideoJObject.Children().ToList
|
||||
For Each item As JProperty In VideoData
|
||||
item.CreateReader()
|
||||
Select Case item.Name
|
||||
Case "audio_locale"
|
||||
Dim Title As String = item.Value.ToString
|
||||
CR_audio_locale = String.Join(" ", Title.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "")
|
||||
|
||||
Case "streams" 'each record is inside the entries array
|
||||
For Each Entry As JProperty In item.Values
|
||||
|
||||
Dim JsonEntryFormat As String = Entry.Name
|
||||
If CBool(InStr(JsonEntryFormat, "drm")) Or CBool(InStr(JsonEntryFormat, "dash")) Or CBool(InStr(JsonEntryFormat, "download")) Then
|
||||
Continue For
|
||||
If CBool(InStr(VideoJson, "audio_locale")) Then
|
||||
Dim CR_audio As String() = VideoJson.Split(New String() {"audio_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim CR_audio2 As String() = CR_audio(1).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
|
||||
CR_audio_locale = String.Join(" ", CR_audio2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c)
|
||||
End If
|
||||
|
||||
|
||||
Dim SubData As List(Of JToken) = Entry.Children().ToList
|
||||
For Each SubItem As JObject In SubData
|
||||
SubItem.CreateReader()
|
||||
|
||||
Dim StreamFormats As List(Of JToken) = SubItem.Children().ToList
|
||||
|
||||
|
||||
For Each HardsubStreams As JProperty In StreamFormats
|
||||
HardsubStreams.CreateReader()
|
||||
Dim SubLang As String = HardsubStreams.Name
|
||||
Dim Url As String = HardsubStreams.Value.ToString
|
||||
If SubLang = Nothing Or SubLang = "" Then
|
||||
SubLang = "null"
|
||||
End If
|
||||
CR_Streams.Add(New CR_Beta_Stream(CR_audio_locale, SubLang, JsonEntryFormat, Url))
|
||||
|
||||
Next
|
||||
Next
|
||||
Next
|
||||
End Select
|
||||
Next
|
||||
|
||||
Dim CR_URI_Master As String = Nothing
|
||||
|
||||
|
||||
For i As Integer = 0 To CR_Streams.Count - 1
|
||||
|
||||
If CR_Streams.Item(i).subLang = LangNew Then
|
||||
Debug.WriteLine(CR_Streams.Item(i).subLang)
|
||||
CR_URI_Master = CR_Streams.Item(i).Url
|
||||
'If SubsOnly = False Then
|
||||
Dim ii As Integer = 0
|
||||
Dim CR_VideoJson As String() = VideoJson.Split(New String() {hls_type}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim CR_VideoJsonHardSubs As String() = CR_VideoJson(1).Split(New String() {"hardsub_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Debug.WriteLine(LangNew)
|
||||
Debug.WriteLine(CR_VideoJsonHardSubs.Count.ToString)
|
||||
Dim hls_List As New List(Of String)
|
||||
For i As Integer = 0 To CR_VideoJsonHardSubs.Count - 1
|
||||
If LangNew = "" And CR_VideoJsonHardSubs(i).Substring(0, 1) = Chr(34) And CBool(InStr(CR_VideoJsonHardSubs(i), "https://")) Then
|
||||
CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0)
|
||||
Debug.WriteLine("Nothing+works")
|
||||
Exit For
|
||||
ElseIf LangNew IsNot "" And CBool(InStr(CR_VideoJsonHardSubs(i), LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) And CBool(InStr(CR_VideoJsonHardSubs(i), "https://")) Then
|
||||
CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0)
|
||||
Debug.WriteLine("Why are we here again?")
|
||||
Exit For
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
|
||||
|
||||
If CR_URI_Master = Nothing Then
|
||||
Me.Invoke(New Action(Function() As Object
|
||||
ResoNotFoundString = VideoJson
|
||||
DialogTaskString = "Language_CR_Beta"
|
||||
ErrorDialog.ShowDialog()
|
||||
Return Nothing
|
||||
End Function))
|
||||
If UserCloseDialog = True Then
|
||||
Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
|
||||
Else
|
||||
LangNew = ResoBackString
|
||||
ResoBackString = Nothing
|
||||
For i As Integer = 0 To CR_VideoJsonHardSubs.Count - 1
|
||||
If CBool(InStr(CR_VideoJsonHardSubs(i), LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
|
||||
CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0)
|
||||
Exit For
|
||||
End If
|
||||
Next
|
||||
End If
|
||||
End If
|
||||
CR_URI_Master = CR_URI_Master.Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
|
||||
If CBool(InStr(CR_URI_Master, "master.m3u8")) Then
|
||||
Me.Invoke(New Action(Function() As Object
|
||||
@ -2800,7 +2788,7 @@ Public Class Main
|
||||
ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL)
|
||||
Return Nothing
|
||||
End Function))
|
||||
liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
' li 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + " <br> " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->"
|
||||
#End Region
|
||||
Grapp_RDY = True
|
||||
@ -2833,11 +2821,10 @@ Public Class Main
|
||||
End If
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Public Sub Get_VRV_Seasons(ByVal JsonUrl As String)
|
||||
Anime_Add.groupBox2.Visible = True
|
||||
Anime_Add.PictureBox1.Enabled = True
|
||||
Anime_Add.PictureBox1.Visible = True
|
||||
Anime_Add.bt_Cancel_mass.Enabled = True
|
||||
Anime_Add.bt_Cancel_mass.Visible = True
|
||||
Anime_Add.groupBox1.Visible = False
|
||||
Anime_Add.ComboBox1.Items.Clear()
|
||||
Anime_Add.comboBox3.Items.Clear()
|
||||
@ -3048,7 +3035,7 @@ Public Class Main
|
||||
ListItemAdd(Filename, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL2, Pfad2)
|
||||
Return Nothing
|
||||
End Function))
|
||||
liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + L1Name + " <br> " + L2Name + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
' liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + L1Name + " <br> " + L2Name + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
|
||||
Else
|
||||
Grapp_non_cr_RDY = True
|
||||
System.IO.Directory.Delete(fi.FullName, True)
|
||||
@ -3395,8 +3382,8 @@ Public Class Main
|
||||
Next
|
||||
'Debug.WriteLine("SeasonJson: ")
|
||||
Anime_Add.groupBox2.Visible = True
|
||||
Anime_Add.PictureBox1.Enabled = True
|
||||
Anime_Add.PictureBox1.Visible = True
|
||||
Anime_Add.bt_Cancel_mass.Enabled = True
|
||||
Anime_Add.bt_Cancel_mass.Visible = True
|
||||
Anime_Add.groupBox1.Visible = False
|
||||
Anime_Add.ComboBox1.Items.Clear()
|
||||
Anime_Add.comboBox3.Items.Clear()
|
||||
@ -4317,7 +4304,7 @@ Public Class Main
|
||||
ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, Funimation_m3u8_MainVersion, SubValuesToDisplay(), thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM")
|
||||
Return Nothing
|
||||
End Function))
|
||||
liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->")
|
||||
'liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->")
|
||||
#End Region
|
||||
Me.Invoke(New Action(Function() As Object
|
||||
Me.Text = "Crunchyroll Downloader"
|
||||
@ -4341,34 +4328,55 @@ Public Class Main
|
||||
|
||||
#End Region
|
||||
Private Sub Timer3_Tick(sender As Object, e As EventArgs) Handles Timer3.Tick
|
||||
Me.Invalidate()
|
||||
Try
|
||||
' PrepareHTML()
|
||||
Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", Me.Text.Replace("open the add window to continue", ""))
|
||||
|
||||
For i As Integer = 0 To ItemList.Count - 1
|
||||
Dim Item As String = My.Resources.htmlvorThumbnail + ItemList.Item(i).GetThumbnailSource + My.Resources.htmlnachTumbnail + ItemList.Item(i).Label_website.Text + " <br> " + ItemList.Item(i).Label_Anime.Text + My.Resources.htmlvorAufloesung.Replace("0%", ItemList.Item(i).Label_percent.Text).Replace("width:0%", ItemList.Item(i).GetPercentValue.ToString + "%") + ItemList.Item(i).Label_Reso.Text + My.Resources.htmlvorSoftSubs + vbNewLine + My.Resources.htmlvorHardSubs + ItemList.Item(i).Label_Hardsub.Text + My.Resources.htmlnachHardSubs
|
||||
GeckoHTML = GeckoHTML + vbNewLine + Item
|
||||
Next
|
||||
|
||||
|
||||
|
||||
Dim c As String = GeckoHTML + vbNewLine + My.Resources.htmlEnd
|
||||
Dim Balken As String = "balken.png"
|
||||
c = c.Replace("balken1.png", Balken)
|
||||
Dim CC As String = "cc.png"
|
||||
c = c.Replace("cc1.png", CC)
|
||||
HTML = c
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub PrepareHTML()
|
||||
'Me.Invalidate()
|
||||
'Try
|
||||
Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", Me.Text.Replace("open the add window to continue", ""))
|
||||
Dim LiAdd As String = Nothing
|
||||
For ii As Integer = 0 To ItemList.Count - 1
|
||||
For i As Integer = 0 To liList.Count - 1
|
||||
If CBool(InStr(liList(i), "<!-- " + ItemList.Item(ii).GetNameAnime + "-->")) Then
|
||||
If CBool(InStr(liList(i), "Finished - ")) Then
|
||||
If LiAdd = Nothing Then
|
||||
LiAdd = liList(i)
|
||||
Else
|
||||
LiAdd = LiAdd + vbNewLine + liList(i)
|
||||
End If
|
||||
Else
|
||||
Dim ProzentBalken As String() = liList(i).Split(New String() {"width:"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim ProzentBalken2 As String() = ProzentBalken(1).Split(New String() {"%" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim ProzentZahl As String() = ProzentBalken2(1).Split(New String() {"'percenttext'>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim ProzentZahl2 As String() = ProzentZahl(1).Split(New String() {"%<"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
liList(i) = ProzentBalken(0) + "width:" + ItemList.Item(ii).GetPercentValue.ToString + "%" + Chr(34) + ProzentZahl(0) + "'percenttext'>" + ItemList.Item(ii).GetLabelPercent.ToString + "<" + ProzentZahl2(1)
|
||||
If LiAdd = Nothing Then
|
||||
LiAdd = liList(i)
|
||||
Else
|
||||
LiAdd = LiAdd + vbNewLine + liList(i)
|
||||
End If
|
||||
Exit For
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
For i As Integer = 0 To ItemList.Count - 1
|
||||
'For i As Integer = 0 To liList.Count - 1
|
||||
'MsgBox(liList.Item(i))
|
||||
'MsgBox(liList(i))
|
||||
'
|
||||
Dim Item As String = My.Resources.htmlvorThumbnail + ItemList.Item(i).GetThumbnailSource + My.Resources.htmlnachTumbnail + ItemList.Item(i).Label_website.Text + " <br> " + ItemList.Item(i).Label_Anime.Text + My.Resources.htmlvorAufloesung.Replace("0%", ItemList.Item(i).GetPercentValue.ToString + "%") + ItemList.Item(i).Label_Reso.Text + My.Resources.htmlvorSoftSubs + vbNewLine + My.Resources.htmlvorHardSubs + ItemList.Item(i).Label_Hardsub.Text + My.Resources.htmlnachHardSubs
|
||||
|
||||
'If CBool(InStr(liList(i), "<!-- " + ItemList.Item(ii).GetNameAnime + "-->")) Then
|
||||
' If CBool(InStr(liList(i), "Finished - ")) Then
|
||||
' If LiAdd = Nothing Then
|
||||
' LiAdd = liList(i)
|
||||
' Else
|
||||
' LiAdd = LiAdd + vbNewLine + liList(i)
|
||||
' End If
|
||||
' Else
|
||||
' Dim ProzentBalken As String() = liList(i).Split(New String() {"width:"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim ProzentBalken2 As String() = ProzentBalken(1).Split(New String() {"%" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim ProzentZahl As String() = ProzentBalken2(1).Split(New String() {"'percenttext'>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim ProzentZahl2 As String() = ProzentZahl(1).Split(New String() {"%<"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim ReAdd As String = ProzentBalken(0) + "width:" + ItemList.Item(i).GetPercentValue.ToString + "%" + Chr(34) + ProzentZahl(0) + "'percenttext'>" + ItemList.Item(ii).GetLabelPercent.ToString + "<" + ProzentZahl2(1)
|
||||
'
|
||||
' Exit For
|
||||
' End If
|
||||
'End If
|
||||
'Next
|
||||
Next
|
||||
Dim c As String = GeckoHTML + vbNewLine + LiAdd + vbNewLine + My.Resources.htmlEnd
|
||||
Dim Balken As String = "balken.png"
|
||||
@ -4376,12 +4384,13 @@ Public Class Main
|
||||
Dim CC As String = "cc.png"
|
||||
c = c.Replace("cc1.png", CC)
|
||||
HTML = c
|
||||
Catch ex As Exception
|
||||
'Debug.WriteLine(ex.ToString)
|
||||
'MsgBox(ex.ToString)
|
||||
End Try
|
||||
'Catch ex As Exception
|
||||
' Debug.WriteLine(ex.ToString)
|
||||
' MsgBox(ex.ToString)
|
||||
'End Try
|
||||
End Sub
|
||||
|
||||
|
||||
#Region "process html"
|
||||
Public Sub ProcessHTML(ByVal document As String, ByVal Address As String, ByVal DocumentTitle As String)
|
||||
Dim localHTML As String = document
|
||||
@ -5300,6 +5309,16 @@ Public Class Main
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub AddonHTMLToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AddonHTMLToolStripMenuItem.Click
|
||||
My.Computer.Clipboard.SetText(HTML)
|
||||
End Sub
|
||||
|
||||
Private Sub Timer3OffToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles Timer3OffToolStripMenuItem.Click
|
||||
Timer3.Enabled = False
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
#End Region
|
||||
End Class
|
||||
|
||||
|
||||
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.8.8.1")>
|
||||
<Assembly: AssemblyFileVersion("3.8.8.1")>
|
||||
<Assembly: AssemblyVersion("3.8.9")>
|
||||
<Assembly: AssemblyFileVersion("3.8.9")>
|
||||
<Assembly: NeutralResourcesLanguage("en")>
|
||||
|
||||
@ -337,7 +337,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0" ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0" ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property ffmpeg_user_agend() As String
|
||||
Get
|
||||
@ -921,36 +921,6 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property softsubs_download() As System.Drawing.Bitmap
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("softsubs_download", resourceCulture)
|
||||
Return CType(obj,System.Drawing.Bitmap)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property softsubs_download_gray() As System.Drawing.Bitmap
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("softsubs_download_gray", resourceCulture)
|
||||
Return CType(obj,System.Drawing.Bitmap)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property softsubs_download_hover() As System.Drawing.Bitmap
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("softsubs_download_hover", resourceCulture)
|
||||
Return CType(obj,System.Drawing.Bitmap)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die <!DOCTYPE html>
|
||||
'''<html>
|
||||
|
||||
@ -222,9 +222,6 @@
|
||||
<data name="LoginSuccess" xml:space="preserve">
|
||||
<value>"error":false,"code":"ok"</value>
|
||||
</data>
|
||||
<data name="main_button_download_deactivate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\main_button_download-deactivate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="AoD_Image" xml:space="preserve">
|
||||
<value>"image":"</value>
|
||||
</data>
|
||||
@ -316,9 +313,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
|
||||
<br>
|
||||
<span dir="auto" class="resotext"></value>
|
||||
</data>
|
||||
<data name="softsubs_download_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\softsubs_download_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Startuphtml" xml:space="preserve">
|
||||
<value><!DOCTYPE html>
|
||||
<html>
|
||||
@ -368,9 +362,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
|
||||
<data name="download_subs_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\download_subs_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="softsubs_download_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\softsubs_download_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="main_close" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\main-close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@ -401,7 +392,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:87.0) Gecko/20100101 Firefox/87.0"</value>
|
||||
<value>"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.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>
|
||||
@ -420,9 +411,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
|
||||
<data name="add_mass_cancel_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\add_mass_cancel_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="softsubs_download" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\softsubs_download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@ -541,4 +529,7 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
|
||||
<data name="CR_MovieTop" xml:space="preserve">
|
||||
<value><span itemprop="name"></value>
|
||||
</data>
|
||||
<data name="main_button_download_deactivate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\main_button_download-deactivate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 5.0 KiB |
@ -330,7 +330,7 @@ Public Class network_scan
|
||||
Dim L1Name As String = L1Name_Split(1)
|
||||
Me.Invoke(New Action(Function() As Object
|
||||
Main.ListItemAdd(Main.Pfad, L1Name, Title, DisplayReso, "Unknown", "None", "", m3u8Final, Pfad2)
|
||||
Main.liList.Add(My.Resources.htmlvorThumbnail + "" + My.Resources.htmlnachTumbnail + "<br>" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + Title + "-->")
|
||||
'Main.liList.Add(My.Resources.htmlvorThumbnail + "" + My.Resources.htmlnachTumbnail + "<br>" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + Title + "-->")
|
||||
Return Nothing
|
||||
End Function))
|
||||
Else
|
||||
@ -432,7 +432,7 @@ Public Class network_scan
|
||||
Dim L1Name As String = L1Name_Split(1)
|
||||
Me.Invoke(New Action(Function() As Object
|
||||
Main.ListItemAdd(Main.Pfad, L1Name, Title, DisplayReso, "Unknown", "None", thumbnail4, m3u8Final, Pfad2)
|
||||
Main.liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + "<br>" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + Title + "-->")
|
||||
'Main.liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + "<br>" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + Title + "-->")
|
||||
Return Nothing
|
||||
End Function))
|
||||
ElseIf ComboBox1.SelectedItem.ToString = "Subtile" Then
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="cef.redist.x64" version="101.0.18" targetFramework="net48" />
|
||||
<package id="cef.redist.x86" version="101.0.18" targetFramework="net48" />
|
||||
<package id="CefSharp.Common" version="101.0.180" targetFramework="net48" />
|
||||
<package id="CefSharp.WinForms" version="101.0.180" targetFramework="net48" />
|
||||
<package id="cef.redist.x64" version="103.0.9" targetFramework="net48" />
|
||||
<package id="cef.redist.x86" version="103.0.9" targetFramework="net48" />
|
||||
<package id="CefSharp.Common" version="103.0.90" targetFramework="net48" />
|
||||
<package id="CefSharp.WinForms" version="103.0.90" targetFramework="net48" />
|
||||
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
|
||||
</packages>
|
||||
Loading…
Reference in New Issue
Block a user