file name and path changes

file name and path changes
small ui changes
This commit is contained in:
hama3254 2021-08-08 12:23:22 +02:00
parent 35808777a1
commit ebb6427ef2
14 changed files with 89 additions and 69 deletions

Binary file not shown.

View File

@ -31,7 +31,7 @@ Partial Class Anime_Add
Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox() Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox()
Me.TextBox4 = New MetroFramework.Controls.MetroTextBox() Me.TextBox4 = New MetroFramework.Controls.MetroTextBox()
Me.textBox1 = New MetroFramework.Controls.MetroTextBox() Me.textBox1 = New MetroFramework.Controls.MetroTextBox()
Me.textBox2 = New MetroFramework.Controls.MetroTextBox() Me.TextBox2 = New MetroFramework.Controls.MetroTextBox()
Me.pictureBox4 = New System.Windows.Forms.PictureBox() Me.pictureBox4 = New System.Windows.Forms.PictureBox()
Me.groupBox2 = New System.Windows.Forms.GroupBox() Me.groupBox2 = New System.Windows.Forms.GroupBox()
Me.comboBox4 = New MetroFramework.Controls.MetroComboBox() Me.comboBox4 = New MetroFramework.Controls.MetroComboBox()
@ -62,7 +62,7 @@ Partial Class Anime_Add
Me.groupBox1.Controls.Add(Me.ComboBox2) Me.groupBox1.Controls.Add(Me.ComboBox2)
Me.groupBox1.Controls.Add(Me.TextBox4) Me.groupBox1.Controls.Add(Me.TextBox4)
Me.groupBox1.Controls.Add(Me.textBox1) Me.groupBox1.Controls.Add(Me.textBox1)
Me.groupBox1.Controls.Add(Me.textBox2) Me.groupBox1.Controls.Add(Me.TextBox2)
Me.groupBox1.Location = New System.Drawing.Point(15, 70) Me.groupBox1.Location = New System.Drawing.Point(15, 70)
Me.groupBox1.Name = "groupBox1" Me.groupBox1.Name = "groupBox1"
Me.groupBox1.Size = New System.Drawing.Size(720, 280) Me.groupBox1.Size = New System.Drawing.Size(720, 280)
@ -189,42 +189,42 @@ Partial Class Anime_Add
Me.textBox1.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) Me.textBox1.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.textBox1.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) Me.textBox1.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
' '
'textBox2 'TextBox2
' '
Me.textBox2.BackColor = System.Drawing.Color.White Me.TextBox2.BackColor = System.Drawing.Color.White
Me.textBox2.Cursor = System.Windows.Forms.Cursors.Hand Me.TextBox2.Cursor = System.Windows.Forms.Cursors.Hand
' '
' '
' '
Me.textBox2.CustomButton.Image = Nothing Me.TextBox2.CustomButton.Image = Nothing
Me.textBox2.CustomButton.Location = New System.Drawing.Point(665, 1) Me.TextBox2.CustomButton.Location = New System.Drawing.Point(665, 1)
Me.textBox2.CustomButton.Name = "" Me.TextBox2.CustomButton.Name = ""
Me.textBox2.CustomButton.Size = New System.Drawing.Size(27, 27) Me.TextBox2.CustomButton.Size = New System.Drawing.Size(27, 27)
Me.textBox2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue Me.TextBox2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
Me.textBox2.CustomButton.TabIndex = 1 Me.TextBox2.CustomButton.TabIndex = 1
Me.textBox2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light Me.TextBox2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
Me.textBox2.CustomButton.UseSelectable = True Me.TextBox2.CustomButton.UseSelectable = True
Me.textBox2.CustomButton.Visible = False Me.TextBox2.CustomButton.Visible = False
Me.textBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium Me.TextBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium
Me.textBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.TextBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
Me.textBox2.Lines = New String() {"Use Custom Name"} Me.TextBox2.Lines = New String() {"Use Custom Name"}
Me.textBox2.Location = New System.Drawing.Point(18, 64) Me.TextBox2.Location = New System.Drawing.Point(18, 64)
Me.textBox2.MaxLength = 32767 Me.TextBox2.MaxLength = 32767
Me.textBox2.Name = "textBox2" Me.TextBox2.Name = "TextBox2"
Me.textBox2.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) Me.TextBox2.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
Me.textBox2.ScrollBars = System.Windows.Forms.ScrollBars.None Me.TextBox2.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.textBox2.SelectedText = "" Me.TextBox2.SelectedText = ""
Me.textBox2.SelectionLength = 0 Me.TextBox2.SelectionLength = 0
Me.textBox2.SelectionStart = 0 Me.TextBox2.SelectionStart = 0
Me.textBox2.ShortcutsEnabled = True Me.TextBox2.ShortcutsEnabled = True
Me.textBox2.Size = New System.Drawing.Size(693, 29) Me.TextBox2.Size = New System.Drawing.Size(693, 29)
Me.textBox2.TabIndex = 5 Me.TextBox2.TabIndex = 5
Me.textBox2.TabStop = False Me.TextBox2.TabStop = False
Me.textBox2.Text = "Use Custom Name" Me.TextBox2.Text = "Use Custom Name"
Me.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
Me.textBox2.UseSelectable = True Me.TextBox2.UseSelectable = True
Me.textBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) Me.TextBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.textBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) Me.TextBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
' '
'pictureBox4 'pictureBox4
' '
@ -413,7 +413,7 @@ Partial Class Anime_Add
Friend WithEvents MetroTextBox1 As MetroFramework.Controls.MetroTextBox Friend WithEvents MetroTextBox1 As MetroFramework.Controls.MetroTextBox
Public WithEvents textBox1 As MetroFramework.Controls.MetroTextBox Public WithEvents textBox1 As MetroFramework.Controls.MetroTextBox
Public WithEvents TextBox4 As MetroFramework.Controls.MetroTextBox Public WithEvents TextBox4 As MetroFramework.Controls.MetroTextBox
Public WithEvents textBox2 As MetroFramework.Controls.MetroTextBox Public WithEvents TextBox2 As MetroFramework.Controls.MetroTextBox
Public WithEvents ComboBox2 As MetroFramework.Controls.MetroComboBox Public WithEvents ComboBox2 As MetroFramework.Controls.MetroComboBox
Public WithEvents comboBox4 As MetroFramework.Controls.MetroComboBox Public WithEvents comboBox4 As MetroFramework.Controls.MetroComboBox
Public WithEvents ComboBox1 As MetroFramework.Controls.MetroComboBox Public WithEvents ComboBox1 As MetroFramework.Controls.MetroComboBox

View File

@ -758,8 +758,11 @@ Public Class Anime_Add
Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
If ListBox1.Items.Count > 0 Then If ListBox1.Items.Count > 0 Then
If StatusLabel.Text = "Status: idle" Then If StatusLabel.Text = "Status: idle" Then
StatusLabel.Text = "Status: items in queue, click to work off." StatusLabel.Cursor = Cursors.Hand
StatusLabel.Text = "Status: items in queue, click me to work off."
End If End If
Else
StatusLabel.Cursor = Cursors.Default
End If End If
End Sub End Sub
@ -874,7 +877,7 @@ Public Class Anime_Add
End Sub End Sub
Private Sub StatusLabel_Click(sender As Object, e As EventArgs) Handles StatusLabel.Click Private Sub StatusLabel_Click(sender As Object, e As EventArgs) Handles StatusLabel.Click
If StatusLabel.Text = "Status: items in queue, click to work off." Then If StatusLabel.Text = "Status: items in queue, click me to work off." Then
groupBox1.Visible = False groupBox1.Visible = False
groupBox2.Visible = False groupBox2.Visible = False
GroupBox3.Visible = True GroupBox3.Visible = True
@ -885,9 +888,9 @@ Public Class Anime_Add
End Sub End Sub
Private Sub TextBox2_Click(sender As Object, e As EventArgs) Handles textBox2.Click Private Sub TextBox2_Click(sender As Object, e As EventArgs) Handles TextBox2.Click
If textBox2.Text = "Use Custom Name" Then If TextBox2.Text = "Use Custom Name" Then
textBox2.Text = Nothing TextBox2.Text = Nothing
End If End If
End Sub End Sub
@ -1471,4 +1474,10 @@ Public Class Anime_Add
End Sub End Sub
Private Sub groupBox1_VisibleChanged(sender As Object, e As EventArgs) Handles groupBox1.VisibleChanged
If Not TextBox2.Text = "Use Custom Name" Then
TextBox2.Text = "Use Custom Name"
End If
End Sub
End Class End Class

View File

@ -119,7 +119,7 @@ Public Class GeckoFX
ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "season-dropdown content-menu block")) Then ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "season-dropdown content-menu block")) Then
Main.b = True Main.b = True
Anime_Add.textBox2.Text = "Use Custom Name" Anime_Add.TextBox2.Text = "Use Custom Name"
Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle Main.WebbrowserTitle = WebBrowser1.DocumentTitle
@ -129,7 +129,7 @@ Public Class GeckoFX
ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "wrapper container-shadow hover-classes")) Then ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "wrapper container-shadow hover-classes")) Then
Main.b = True Main.b = True
Anime_Add.textBox2.Text = "Use Custom Name" Anime_Add.TextBox2.Text = "Use Custom Name"
Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle Main.WebbrowserTitle = WebBrowser1.DocumentTitle

View File

@ -1188,7 +1188,7 @@ Public Class Main
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
TextBox2_Text = Anime_Add.textBox2.Text TextBox2_Text = Anime_Add.TextBox2.Text
' My.Computer.Clipboard.SetText(WebbrowserText) ' My.Computer.Clipboard.SetText(WebbrowserText)
Return Nothing Return Nothing
End Function)) End Function))
@ -1889,7 +1889,8 @@ Public Class Main
Dim CR_series_title As String = Nothing Dim CR_series_title As String = Nothing
Dim CR_season_number As String = Nothing Dim CR_season_number As String = Nothing
Dim CR_episode As String = Nothing Dim CR_episode As String = Nothing
'Dim CR_season_title As String = Nothing Dim CR_Anime_Staffel_int As String = Nothing
Dim CR_episode_int As String = Nothing
Dim CR_title As String = Nothing Dim CR_title As String = Nothing
Dim CR_audio_locale As String = Nothing Dim CR_audio_locale As String = Nothing
@ -1900,7 +1901,7 @@ Public Class Main
Dim ObjectJson As String = Nothing Dim ObjectJson As String = Nothing
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
TextBox2_Text = Anime_Add.textBox2.Text TextBox2_Text = Anime_Add.TextBox2.Text
Return Nothing Return Nothing
End Function)) End Function))
#Region "Name von Crunchyroll" #Region "Name von Crunchyroll"
@ -2004,9 +2005,8 @@ Public Class Main
'My.Computer.Clipboard.SetText(ObjectJson) 'My.Computer.Clipboard.SetText(ObjectJson)
' '
CR_Anime_Staffel_int = CR_season_number
CR_episode_int = CR_episode
If Season_Prefix = "[default season prefix]" Then If Season_Prefix = "[default season prefix]" Then
If CR_episode = Nothing Then 'no episode number means most likey a movie If CR_episode = Nothing Then 'no episode number means most likey a movie
@ -2057,6 +2057,17 @@ Public Class Main
End If End If
End If End If
If KodiNaming = True Then
Dim KodiString As String = "[S"
If CR_Anime_Staffel_int = "0" Then
CR_Anime_Staffel_int = "01"
Else
CR_Anime_Staffel_int = "0" + CR_Anime_Staffel_int
End If
KodiString = KodiString + CR_Anime_Staffel_int + " E" + CR_episode_int
KodiString = KodiString + "] "
CR_FilenName = KodiString + CR_FilenName
End If
Debug.WriteLine(CR_FilenName) Debug.WriteLine(CR_FilenName)
#End Region #End Region
@ -2528,10 +2539,10 @@ Public Class Main
Private Sub RetryWithCachedFiles() Private Sub RetryWithCachedFiles()
Try Try
Dim di As New System.IO.DirectoryInfo(Pfad) Dim di As New System.IO.DirectoryInfo(Pfad)
For Each fi As System.IO.DirectoryInfo In di.EnumerateDirectories("*.*", System.IO.SearchOption.TopDirectoryOnly) For Each fi As System.IO.DirectoryInfo In di.EnumerateDirectories("*.*", System.IO.SearchOption.TopDirectoryOnly)
If fi.Attributes.HasFlag(System.IO.FileAttributes.Hidden) Then If fi.Attributes.HasFlag(System.IO.FileAttributes.Hidden) Then
Else Else
If InStr(fi.Name, "CRD-Temp-File-") Then If InStr(fi.Name, "CRD-Temp-File-") Then
If File.Exists(fi.FullName + "\Retry\retry.txt") Then If File.Exists(fi.FullName + "\Retry\retry.txt") Then
If MessageBox.Show("Cached data found, you can try to retry the download by pressing 'Yes'", "Retry?", MessageBoxButtons.YesNo) = DialogResult.Yes Then If MessageBox.Show("Cached data found, you can try to retry the download by pressing 'Yes'", "Retry?", MessageBoxButtons.YesNo) = DialogResult.Yes Then
@ -2581,9 +2592,9 @@ Public Class Main
End If End If
End If End If
Next Next
Catch ex As Exception Catch ex As Exception
End Try End Try
End Sub End Sub
@ -2935,7 +2946,7 @@ Public Class Main
#Region "Pfad" #Region "Pfad"
Dim TextBox2_Text As String = Nothing Dim TextBox2_Text As String = Nothing
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
TextBox2_Text = Anime_Add.textBox2.Text TextBox2_Text = Anime_Add.TextBox2.Text
Return Nothing Return Nothing
End Function)) End Function))
@ -3885,29 +3896,29 @@ Public Class Main
Dim SubData As List(Of JToken) = item.Values.ToList() Dim SubData As List(Of JToken) = item.Values.ToList()
For Each SubItem As JProperty In SubData For Each SubItem As JProperty In SubData
Select Case SubItem.Name Select Case SubItem.Name
Case "name" Case "name"
If Season_Prefix = "[default season prefix]" Then If Season_Prefix = "[default season prefix]" Then
FunimationSeason = SubItem.Value.ToString FunimationSeason = SubItem.Value.ToString
Debug.WriteLine("FunimationSeason: " + FunimationSeason) Debug.WriteLine("FunimationSeason: " + FunimationSeason)
End If End If
Case "number" Case "number"
If Season_Prefix = "[default season prefix]" Then If Season_Prefix = "[default season prefix]" Then
'FunimationSeason = Entry("name") 'FunimationSeason = Entry("name")
Else Else
Dim EpisodeNumer As String = SubItem.Value.ToString Dim EpisodeNumer As String = SubItem.Value.ToString
FunimationSeason = Season_Prefix + " " + EpisodeNumer FunimationSeason = Season_Prefix + " " + EpisodeNumer
Debug.WriteLine("FunimationSeason: " + FunimationSeason) Debug.WriteLine("FunimationSeason: " + FunimationSeason)
End If End If
End Select End Select
Next Next
@ -3958,7 +3969,7 @@ Public Class Main
#Region "Pfad" #Region "Pfad"
Dim TextBox2_Text As String = Nothing Dim TextBox2_Text As String = Nothing
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
TextBox2_Text = Anime_Add.textBox2.Text TextBox2_Text = Anime_Add.TextBox2.Text
Return Nothing Return Nothing
End Function)) End Function))

View File

@ -17,7 +17,7 @@ Public Class Einstellungen
Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Beta-U12" Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Beta-U13"
BackgroundWorker1.RunWorkerAsync() BackgroundWorker1.RunWorkerAsync()