small fixes

2024-12-23 22:51:48 +01:00 · 2020-12-03 19:29:44 +01:00 · 2020-12-03 19:29:44 +01:00 · df236bd401
commit df236bd401
parent 46ddd0dc55
23 changed files with 126 additions and 58 deletions
--- a/Downloader/v15/.suo
+++ b/Downloader/v15/.suo
--- a/Downloader/v15/Browse.VC.db
+++ b/Downloader/v15/Browse.VC.db
--- a/Downloader/v15/Server/sqlite3/storage.ide
+++ b/Downloader/v15/Server/sqlite3/storage.ide
--- a/Downloader/v15/Server/sqlite3/storage.ide-shm
+++ b/Downloader/v15/Server/sqlite3/storage.ide-shm
--- a/Downloader/v15/Server/sqlite3/storage.ide-wal
+++ b/Downloader/v15/Server/sqlite3/storage.ide-wal
--- a/Downloader/CRD_List_Item.Designer.vb
+++ b/Downloader/CRD_List_Item.Designer.vb
@ -102,15 +102,15 @@ Partial Class CRD_List_Item
        Me.Label_Reso.Font = New System.Drawing.Font("Consolas", 12.0!, System.Drawing.FontStyle.Bold)
        Me.Label_Reso.Location = New System.Drawing.Point(195, 101)
        Me.Label_Reso.Name = "Label_Reso"
-        Me.Label_Reso.Size = New System.Drawing.Size(99, 19)
+        Me.Label_Reso.Size = New System.Drawing.Size(54, 19)
        Me.Label_Reso.TabIndex = 5
-        Me.Label_Reso.Text = "Resolution"
+        Me.Label_Reso.Text = "1080p"
        '
        'Label_Hardsub
        '
        Me.Label_Hardsub.AutoSize = True
        Me.Label_Hardsub.Font = New System.Drawing.Font("Consolas", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.Label_Hardsub.Location = New System.Drawing.Point(300, 101)
+        Me.Label_Hardsub.Location = New System.Drawing.Point(260, 101)
        Me.Label_Hardsub.Name = "Label_Hardsub"
        Me.Label_Hardsub.Size = New System.Drawing.Size(126, 19)
        Me.Label_Hardsub.TabIndex = 6
--- a/Downloader/CRD_List_Item.vb
+++ b/Downloader/CRD_List_Item.vb
@ -303,7 +303,7 @@ Public Class CRD_List_Item
        Label_website.Location = New Point(195, locationY + 15)
        Label_Anime.Location = New Point(195, locationY + 42)
        Label_Reso.Location = New Point(195, locationY + 101)
-        Label_Hardsub.Location = New Point(300, locationY + 101)
+        Label_Hardsub.Location = New Point(260, locationY + 101)
        Label_percent.SetBounds(432, locationY + 101, 378, 19)
        Label_percent.AutoSize = False
        ProgressBar1.SetBounds(195, locationY + 70, 601, 20)
--- a/Downloader/Main.designer.vb
+++ b/Downloader/Main.designer.vb
@ -137,6 +137,7 @@ Partial Class Main
        '
        'Timer1
        '
+        Me.Timer1.Enabled = True
        '
        'Timer2
        '
--- a/Downloader/Main.vb
+++ b/Downloader/Main.vb
@ -132,23 +132,6 @@ Public Class Main
        Me.Invalidate()
    End Sub

-    Private Sub ListView1_MouseWheel(sender As Object, e As MouseEventArgs) Handles ListView1.MouseWheel
-        Try
-            For s As Integer = 0 To ListView1.Items.Count - 1
-                Dim r As Rectangle = ListView1.Items.Item(s).Bounds
-                ItemList(s).SetBounds(r.X, r.Y, ListView1.Width - 2, r.Height)
-
-                If ItemList(s).GetToDispose() = True Then
-                    ItemList(s).DisposeItem(ItemList(s).GetToDispose())
-                    ItemList.RemoveAt(s)
-                    ListView1.Items.RemoveAt(s)
-                End If
-
-            Next
-        Catch ex As Exception
-
-        End Try
-    End Sub


    Dim ListViewHeightOffset As Integer = 7
@ -1286,42 +1269,42 @@ Public Class Main
                'End If
                CR_FilenName = CR_Title
                CR_FilenName_Backup = CR_Title
-                'MsgBox(CR_FilenName)
+            'MsgBox(CR_FilenName)

-                If CBool(InStr(WebbrowserText, "<h4>")) Then ' false on movie true on series
-                    Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"<h4>"}, System.StringSplitOptions.RemoveEmptyEntries)
-                    Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"</h4>"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
-                    Dim CR_Name_Staffel0_Folge1 As String()
-                    If CBool(InStr(CR_Name_2(0), ",")) Then
-                        CR_Name_Staffel0_Folge1 = CR_Name_2(0).Split(New [Char]() {System.Convert.ToChar(",")}, System.StringSplitOptions.RemoveEmptyEntries)
-                        CR_Anime_Staffel = CR_Name_Staffel0_Folge1(0).Trim()
-                        CR_Anime_Folge = CR_Name_Staffel0_Folge1(1).Trim()
-                        CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
-                    Else
-                        CR_Anime_Staffel = Nothing
-                        CR_Anime_Folge = CR_Name_2(0).Trim()
-                        CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
-                    End If
-
-
-                    Dim CR_Name_4 As String() = CR_Name_1(0).Split(New String() {"class=" + Chr(34) + "text-link" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
-                    Dim CR_Name_Anime0 As String() = CR_Name_4(CR_Name_4.Length - 1).Split(New String() {"</a>"}, System.StringSplitOptions.RemoveEmptyEntries)
-                    CR_Name_Anime0(0) = System.Text.RegularExpressions.Regex.Replace(CR_Name_Anime0(0), "[^\w\\-]", " ")
-                    CR_Anime_Titel = CR_Name_Anime0(0).Trim
-
-                    CR_FilenName_Backup = RemoveExtraSpaces(CR_FilenName)
-
-
-                End If
-                If CBool(InStr(WebbrowserText, "vilos.config.player.pause_screen.text = " + Chr(34))) Then
-
-                    Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"vilos.config.player.pause_screen.text = " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
-                    Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {Chr(34) + ";"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
-                    CR_Anime_Name = System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ")
-                    CR_Anime_Name = RemoveExtraSpaces(CR_Anime_Name)
+            If CBool(InStr(WebbrowserText, "<h4>")) Then ' false on movie true on series
+                Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"<h4>"}, System.StringSplitOptions.RemoveEmptyEntries)
+                Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"</h4>"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
+                Dim CR_Name_Staffel0_Folge1 As String()
+                If CBool(InStr(CR_Name_2(0), ",")) Then
+                    CR_Name_Staffel0_Folge1 = CR_Name_2(0).Split(New [Char]() {System.Convert.ToChar(",")}, System.StringSplitOptions.RemoveEmptyEntries)
+                    CR_Anime_Staffel = CR_Name_Staffel0_Folge1(0).Trim()
+                    CR_Anime_Folge = CR_Name_Staffel0_Folge1(1).Trim()
+                    CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
+                Else
+                    CR_Anime_Staffel = Nothing
+                    CR_Anime_Folge = CR_Name_2(0).Trim()
+                    CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
                End If

-                If CR_NameMethode = 0 Then
+
+                Dim CR_Name_4 As String() = CR_Name_1(0).Split(New String() {"class=" + Chr(34) + "text-link" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
+                Dim CR_Name_Anime0 As String() = CR_Name_4(CR_Name_4.Length - 1).Split(New String() {"</a>"}, System.StringSplitOptions.RemoveEmptyEntries)
+                CR_Name_Anime0(0) = System.Text.RegularExpressions.Regex.Replace(CR_Name_Anime0(0), "[^\w\\-]", " ")
+                CR_Anime_Titel = CR_Name_Anime0(0).Trim
+
+                CR_FilenName_Backup = RemoveExtraSpaces(CR_FilenName)
+
+
+            End If
+
+            If CBool(InStr(WebbrowserText, My.Resources.CR_MediaName)) = True Then ' And CBool(InStr(WebbrowserText, "&rdquo;</h4>")) 
+                Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {My.Resources.CR_MediaName}, System.StringSplitOptions.RemoveEmptyEntries)
+                Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {My.Resources.CR_MediaName2}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
+                CR_Anime_Name = System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ")
+                CR_Anime_Name = RemoveExtraSpaces(CR_Anime_Name)
+            End If
+
+            If CR_NameMethode = 0 Then
                    If CR_Anime_Staffel = Nothing Then
                        CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge
                    Else
@ -1369,7 +1352,7 @@ Public Class Main
            End If

            Pfad2 = Chr(34) + Pfad2 + "\" + CR_FilenName + ".mp4" + Chr(34)
-            Pfad2 = Pfad2.Replace("\\", "\")
+
 #End Region
 #Region "Subs"
            Dim SoftSubs2 As New List(Of String)
@ -1667,7 +1650,11 @@ Public Class Main
                    ResoHTMLDisplay = ResoHTML(0) + "p"
                End If
            End If
-            Dim L2Name As String = CR_FilenName_Backup
+            Dim L2Name As String = System.Text.RegularExpressions.Regex.Replace(CR_FilenName_Backup, "[^\w\\-]", " ")
+            If CR_FilenName = Nothing Then
+            Else
+                L2Name = CR_FilenName
+            End If
            If Reso = 42 Then
                ResoHTMLDisplay = "[Auto]"
            End If
@ -3068,6 +3055,14 @@ Public Class Main
        End If
    End Function

+    Private Sub ListView1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListView1.SelectedIndexChanged
+
+    End Sub
+
+    Private Sub ListView1_RegionChanged(sender As Object, e As EventArgs) Handles ListView1.RegionChanged
+
+    End Sub
+



--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("3.6.0")>
-<Assembly: AssemblyFileVersion("3.6.0")>
+<Assembly: AssemblyVersion("3.6.2")>
+<Assembly: AssemblyFileVersion("3.6.2")>
 <Assembly: NeutralResourcesLanguage("en")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -236,6 +236,24 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die &lt;h4 id=&quot;showmedia_about_name&quot; class=&quot;strong&quot;&gt;“ ähnelt.
+        '''</summary>
+        Friend ReadOnly Property CR_MediaName() As String
+            Get
+                Return ResourceManager.GetString("CR_MediaName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die ”&lt;/h4&gt; ähnelt.
+        '''</summary>
+        Friend ReadOnly Property CR_MediaName2() As String
+            Get
+                Return ResourceManager.GetString("CR_MediaName2", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -526,4 +526,10 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
  <data name="AoD_HTML_Episode_Title" xml:space="preserve">
    <value>&lt;h3 class="episodebox-title" title="</value>
  </data>
+  <data name="CR_MediaName" xml:space="preserve">
+    <value>&lt;h4 id="showmedia_about_name" class="strong"&gt;“</value>
+  </data>
+  <data name="CR_MediaName2" xml:space="preserve">
+    <value>”&lt;/h4&gt;</value>
+  </data>
 </root>
--- a/Downloader/bin/x86/Debug/Crunchyroll
+++ b/Downloader/bin/x86/Debug/Crunchyroll
--- a/Downloader/bin/x86/Debug/Crunchyroll
+++ b/Downloader/bin/x86/Debug/Crunchyroll
--- a/Downloader/bin/x86/Debug/Crunchyroll
+++ b/Downloader/bin/x86/Debug/Crunchyroll
@ -122,6 +122,16 @@ Video Position: 0
  Sucht eine lokalisierte Zeichenfolge, die &lt;meta property=&quot;og:url&quot; content=&quot; ähnelt.
 </summary>
 </member>
+<member name="P:Crunchyroll_Downloader.My.Resources.Resources.CR_MediaName">
+<summary>
+  Sucht eine lokalisierte Zeichenfolge, die &lt;h4 id=&quot;showmedia_about_name&quot; class=&quot;strong&quot;&gt;“ ähnelt.
+</summary>
+</member>
+<member name="P:Crunchyroll_Downloader.My.Resources.Resources.CR_MediaName2">
+<summary>
+  Sucht eine lokalisierte Zeichenfolge, die ”&lt;/h4&gt; ähnelt.
+</summary>
+</member>
 <member name="P:Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background">
 <summary>
  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
--- a/Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.6.2.zip.tmp
+++ b/Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.6.2.zip.tmp
--- a/Downloader/bin/x86/Debug/WebInterface/index.html
+++ b/Downloader/bin/x86/Debug/WebInterface/index.html
@ -30,6 +30,34 @@
 <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() {
--- a/Downloader/obj/x86/Debug/Crunchyroll
+++ b/Downloader/obj/x86/Debug/Crunchyroll
--- a/Downloader/obj/x86/Debug/Crunchyroll
+++ b/Downloader/obj/x86/Debug/Crunchyroll
--- a/Downloader.vbproj.GenerateResource.cache
+++ b/Downloader.vbproj.GenerateResource.cache
--- a/Downloader/obj/x86/Debug/Crunchyroll
+++ b/Downloader/obj/x86/Debug/Crunchyroll
@ -122,6 +122,16 @@ Video Position: 0
  Sucht eine lokalisierte Zeichenfolge, die &lt;meta property=&quot;og:url&quot; content=&quot; ähnelt.
 </summary>
 </member>
+<member name="P:Crunchyroll_Downloader.My.Resources.Resources.CR_MediaName">
+<summary>
+  Sucht eine lokalisierte Zeichenfolge, die &lt;h4 id=&quot;showmedia_about_name&quot; class=&quot;strong&quot;&gt;“ ähnelt.
+</summary>
+</member>
+<member name="P:Crunchyroll_Downloader.My.Resources.Resources.CR_MediaName2">
+<summary>
+  Sucht eine lokalisierte Zeichenfolge, die ”&lt;/h4&gt; ähnelt.
+</summary>
+</member>
 <member name="P:Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background">
 <summary>
  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
--- a/Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources
+++ b/Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources
--- a/Downloader/obj/x86/Debug/TempPE/My
+++ b/Downloader/obj/x86/Debug/TempPE/My