mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-11-14 04:05:07 +01:00
fixes
fix AoD name issue with " - " fix hybrid mode remains
This commit is contained in:
parent
6edf3f416c
commit
001eea9452
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -872,16 +872,29 @@ Public Class Anime_Add
|
||||
Dim AoDTitle0() As String = AoDHTML.Split(New String() {My.Resources.AoD_HTML_Episode_Title}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim AoDTitle00() As String = AoDTitle0(ii + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim AoD_EpisodeSplit() As String = AoDTitle00(0).Split(New String() {" - "}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
If AoD_EpisodeSplit.Count > 2 Then
|
||||
For i3 As Integer = 1 To AoD_EpisodeSplit.Count - 1
|
||||
If AoD_Episode_Title = Nothing Then
|
||||
AoD_Episode_Title = System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(i3), "[^\w\\-]", " ").Trim(" ")
|
||||
Else
|
||||
AoD_Episode_Title = AoD_Episode_Title + " - " + System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(i3), "[^\w\\-]", " ").Trim(" ")
|
||||
|
||||
End If
|
||||
Next
|
||||
AoD_Episode_Number = System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(0), "[^\w\\-]", " ").Trim(" ")
|
||||
Else
|
||||
AoD_Episode_Number = System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(0), "[^\w\\-]", " ").Trim(" ")
|
||||
AoD_Episode_Title = System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(1), "[^\w\\-]", " ").Trim(" ")
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Dim AoDTitle3() As String = AoDHTML.Split(New String() {My.Resources.AoD_HTML_Anime_Title}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim AoDTitle4() As String = AoDTitle3(1).Split(New String() {"</h1>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
If InStr(AoDTitle4(0), " - ") Then
|
||||
Dim AoD_Anime_Season_split() As String = AoDTitle4(0).Split(New String() {" - "}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
AoD_Anime_Title = System.Text.RegularExpressions.Regex.Replace(AoD_Anime_Season_split(0), "[^\w\\-]", " ").Trim(" ")
|
||||
AoD_Season = System.Text.RegularExpressions.Regex.Replace(AoD_Anime_Season_split(1), "[^\w\\-]", " ").Trim(" ")
|
||||
|
||||
Else
|
||||
AoD_Anime_Title = System.Text.RegularExpressions.Regex.Replace(AoDTitle4(0), "[^\w\\-]", " ").Trim(" ")
|
||||
|
||||
|
27
Crunchyroll Downloader/CRD_List_Item.Designer.vb
generated
27
Crunchyroll Downloader/CRD_List_Item.Designer.vb
generated
@ -36,13 +36,16 @@ Partial Class CRD_List_Item
|
||||
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.ViewInExplorerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.PlaybackVideoFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ProgressBar1 = New MetroFramework.Controls.MetroProgressBar()
|
||||
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
|
||||
Me.ProgressBar1 = New MetroFramework.Controls.MetroProgressBar()
|
||||
Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components)
|
||||
Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components)
|
||||
CType(Me.PB_Thumbnail, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.bt_pause, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.bt_del, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.ContextMenuStrip1.SuspendLayout()
|
||||
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'PB_Thumbnail
|
||||
@ -149,13 +152,6 @@ Partial Class CRD_List_Item
|
||||
Me.PlaybackVideoFileToolStripMenuItem.Size = New System.Drawing.Size(172, 22)
|
||||
Me.PlaybackVideoFileToolStripMenuItem.Text = "playback video file"
|
||||
'
|
||||
'ProgressBar1
|
||||
'
|
||||
Me.ProgressBar1.Location = New System.Drawing.Point(195, 70)
|
||||
Me.ProgressBar1.Name = "ProgressBar1"
|
||||
Me.ProgressBar1.Size = New System.Drawing.Size(615, 20)
|
||||
Me.ProgressBar1.TabIndex = 9
|
||||
'
|
||||
'PictureBox5
|
||||
'
|
||||
Me.PictureBox5.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.balken
|
||||
@ -167,6 +163,18 @@ Partial Class CRD_List_Item
|
||||
Me.PictureBox5.TabIndex = 68
|
||||
Me.PictureBox5.TabStop = False
|
||||
'
|
||||
'ProgressBar1
|
||||
'
|
||||
Me.ProgressBar1.Location = New System.Drawing.Point(195, 70)
|
||||
Me.ProgressBar1.Name = "ProgressBar1"
|
||||
Me.ProgressBar1.Size = New System.Drawing.Size(615, 20)
|
||||
Me.ProgressBar1.TabIndex = 9
|
||||
'
|
||||
'MetroStyleManager1
|
||||
'
|
||||
Me.MetroStyleManager1.Owner = Me
|
||||
Me.MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Orange
|
||||
'
|
||||
'CRD_List_Item
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@ -188,6 +196,7 @@ Partial Class CRD_List_Item
|
||||
CType(Me.bt_del, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ContextMenuStrip1.ResumeLayout(False)
|
||||
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ResumeLayout(False)
|
||||
Me.PerformLayout()
|
||||
|
||||
@ -208,4 +217,6 @@ Partial Class CRD_List_Item
|
||||
Friend WithEvents PlaybackVideoFileToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents ProgressBar1 As MetroFramework.Controls.MetroProgressBar
|
||||
Friend WithEvents PictureBox5 As PictureBox
|
||||
Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager
|
||||
Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender
|
||||
End Class
|
||||
|
@ -121,9 +121,15 @@
|
||||
<value>19, 12</value>
|
||||
</metadata>
|
||||
<metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>207, 12</value>
|
||||
<value>119, 14</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>296, 12</value>
|
||||
<value>207, 15</value>
|
||||
</metadata>
|
||||
<metadata name="MetroStyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>364, 15</value>
|
||||
</metadata>
|
||||
<metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>530, 15</value>
|
||||
</metadata>
|
||||
</root>
|
@ -309,6 +309,8 @@ Public Class CRD_List_Item
|
||||
ProgressBar1.SetBounds(195, locationY + 70, 601, 20)
|
||||
PictureBox5.Location = New Point(0, 136)
|
||||
PictureBox5.Height = 6
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Public Function GetTextBound()
|
||||
@ -952,7 +954,7 @@ Public Class CRD_List_Item
|
||||
If HybridMode = True Then
|
||||
Thread.Sleep(5000)
|
||||
Try
|
||||
'System.IO.Directory.Delete(HybridModePath, True)
|
||||
System.IO.Directory.Delete(HybridModePath, True)
|
||||
Catch ex As Exception
|
||||
End Try
|
||||
End If
|
||||
@ -1100,9 +1102,33 @@ Public Class CRD_List_Item
|
||||
ProgressBar1.Width = Me.Width - 223
|
||||
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
|
||||
|
||||
Private Sub Label_Anime_Click(sender As Object, e As EventArgs) Handles ProgressBar1.Click, PB_Thumbnail.Click, MyBase.Click, Label_website.Click, Label_Reso.Click, Label_percent.Click, Label_Anime.Click
|
||||
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
@ -3064,6 +3064,32 @@ Public Class Main
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.6.2")>
|
||||
<Assembly: AssemblyFileVersion("3.6.2")>
|
||||
<Assembly: AssemblyVersion("3.6.3")>
|
||||
<Assembly: AssemblyFileVersion("3.6.3")>
|
||||
<Assembly: NeutralResourcesLanguage("en")>
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -30,34 +30,6 @@
|
||||
<a class="main_titel">Crunchyroll Downloader</a>
|
||||
<img alt="image error" src="balken.png" class="class-balken">
|
||||
|
||||
<div class="div-episode">
|
||||
|
||||
<img alt="image error" src="https://img1.ak.crunchyroll.com/i/spire4-tmb/43a60a9d2877b11429d71c81db6d76361408647106_fwide.jpg" class="imagestyle">
|
||||
|
||||
<div>
|
||||
|
||||
<span class="titel" dir="auto">RWBY <br> Staffel 2 Folge 4 5</span>
|
||||
|
||||
<div class="progressbar">
|
||||
|
||||
<div class="progressbar-value" style="width:100%"></div>
|
||||
|
||||
</div>
|
||||
<span dir="auto" class='percenttext'>Finished - 133,73MB</span>
|
||||
<div>
|
||||
<br>
|
||||
<span dir="auto" class="resotext">1080p</span>
|
||||
|
||||
<a href="#" class="cc-wert" title="Softsubs:
|
||||
"> <img alt="image error" src="cc.png" class="class-cc">Português (Brasil)</a>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<img alt="image error" src="balken.png" class="class-balken"><!-- RWBY Staffel 2 Die Welt von Remnant 1 Dust-->
|
||||
<script>
|
||||
|
||||
setInterval(function loadXMLDoc() {
|
||||
|
3
Crunchyroll Downloader/einstellungen.Designer.vb
generated
3
Crunchyroll Downloader/einstellungen.Designer.vb
generated
@ -1451,7 +1451,7 @@ Partial Class Einstellungen
|
||||
'
|
||||
'MetroStyleManager1
|
||||
'
|
||||
Me.MetroStyleManager1.Owner = Nothing
|
||||
Me.MetroStyleManager1.Owner = Me
|
||||
'
|
||||
'Einstellungen
|
||||
'
|
||||
@ -1637,4 +1637,5 @@ Partial Class Einstellungen
|
||||
Friend WithEvents CheckBox1 As CheckBox
|
||||
Friend WithEvents GroupBox12 As GroupBox
|
||||
Friend WithEvents CR_Filename As ComboBox
|
||||
Friend WithEvents Button1 As Button
|
||||
End Class
|
||||
|
@ -129,10 +129,10 @@
|
||||
<metadata name="MetroStyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</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>
|
||||
<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>
|
@ -13,6 +13,7 @@ Public Class Einstellungen
|
||||
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
|
||||
TabControl1.SelectedIndex = 0
|
||||
Me.StyleManager = MetroStyleManager1
|
||||
For i As Integer = 0 To Main.SoftSubs.Count - 1
|
||||
@ -206,7 +207,7 @@ Public Class Einstellungen
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click
|
||||
Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click
|
||||
Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
|
||||
If InStr(TextBox1.Text, "https://") Then
|
||||
Main.Startseite = TextBox1.Text
|
||||
@ -771,6 +772,32 @@ 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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user