mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-12-24 15:11:48 +01:00
small fixes
small fixes
This commit is contained in:
hama3254
parent
1c309ef781
commit
57efa19966
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -34,7 +34,7 @@ Namespace My
|
||||
Try
|
||||
|
||||
|
||||
Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/79.0"
|
||||
Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0"
|
||||
'sUserAgent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36"
|
||||
|
||||
'MsgBox(Xpcom.XulRunnerVersion)
|
||||
|
||||
@ -338,8 +338,9 @@ Public Class CRD_List_Item
|
||||
If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments
|
||||
Dim new_m3u8_2() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
If TargetReso = 42 Then
|
||||
TargetReso = 1080
|
||||
End If
|
||||
|
||||
Else
|
||||
For i As Integer = 0 To new_m3u8_2.Count - 1
|
||||
'MsgBox("x" + Main.Resu.ToString)
|
||||
If CBool(InStr(new_m3u8_2(i), "x" + TargetReso.ToString)) = True Then
|
||||
@ -360,7 +361,6 @@ Public Class CRD_List_Item
|
||||
text = client0.DownloadString(m3u8_url_3)
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
@ -543,7 +543,7 @@ Public Class CRD_List_Item
|
||||
Dim exepath As String = Application.StartupPath + "\ffmpeg.exe"
|
||||
Dim startinfo As New System.Diagnostics.ProcessStartInfo
|
||||
|
||||
Dim cmd As String = "-allowed_extensions ALL " + DL_URL + " " + DL_Pfad '+ " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
Dim cmd As String = "-headers " + Chr(34) + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + Chr(34) + " -allowed_extensions ALL " + DL_URL + " " + DL_Pfad '+ " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
|
||||
If Debug2 = True Then
|
||||
MsgBox(cmd)
|
||||
@ -584,7 +584,7 @@ Public Class CRD_List_Item
|
||||
|
||||
Dim exepath As String = Application.StartupPath + "\ffmpeg.exe"
|
||||
Dim startinfo As New System.Diagnostics.ProcessStartInfo
|
||||
Dim cmd As String = DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
Dim cmd As String = "-headers " + Chr(34) + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
|
||||
If Debug2 = True Then
|
||||
MsgBox(cmd)
|
||||
@ -736,7 +736,7 @@ Public Class CRD_List_Item
|
||||
'MsgBox(BaseURL + SiteList(i) + vbNewLine + Pfad_DL + "\" + SiteList(i))
|
||||
Dim iWert As Integer = i
|
||||
Using client As New WebClient()
|
||||
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/79.0")
|
||||
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0")
|
||||
client.DownloadFile(BaseURL + SiteList(i), Pfad_DL + "\" + SiteList(i))
|
||||
Pause(1)
|
||||
End Using
|
||||
|
||||
@ -26,6 +26,10 @@ Public Class GeckoFX
|
||||
Main.LoginOnly = "US_UnBlock"
|
||||
Else
|
||||
Try
|
||||
|
||||
If CBool(InStr(WebBrowser1.Document.Uri, "https://api.crunchyroll.com/login.0.json")) Then
|
||||
Main.LoginOnly = "US_UnBlock_Finsihed"
|
||||
Else
|
||||
Dim cookieGrapp As String = WebBrowser1.Document.Body.OuterHtml '.Replace(vbTab, "").Replace(" ", "")
|
||||
If Main.Debug2 = True Then
|
||||
MsgBox(cookieGrapp)
|
||||
@ -43,11 +47,10 @@ Public Class GeckoFX
|
||||
Main.Pause(1)
|
||||
WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "sess_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";")
|
||||
Main.Pause(1)
|
||||
If Main.LoginDialog = True Then
|
||||
'Login.ShowDialog()
|
||||
Else
|
||||
WebBrowser1.Navigate("https://www.crunchyroll.com/")
|
||||
Main.LoginOnly = "US_UnBlock_Finsihed"
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.ToString)
|
||||
End Try
|
||||
|
||||
@ -346,7 +346,7 @@ Public Class Main
|
||||
Dim Thumbnail As Image = My.Resources.main_del
|
||||
Try
|
||||
Dim wc As New WebClient()
|
||||
wc.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/79.0")
|
||||
wc.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0")
|
||||
Dim bytes As Byte() = wc.DownloadData(ThumbnialURL)
|
||||
Dim ms As New MemoryStream(bytes)
|
||||
Thumbnail = System.Drawing.Image.FromStream(ms)
|
||||
|
||||
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.5.4")>
|
||||
<Assembly: AssemblyFileVersion("3.5.4")>
|
||||
<Assembly: AssemblyVersion("3.5.5")>
|
||||
<Assembly: AssemblyFileVersion("3.5.5")>
|
||||
<Assembly: NeutralResourcesLanguage("en")>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,74 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
</head>
|
||||
<html>
|
||||
<title>CRD</title>
|
||||
|
||||
<style>
|
||||
.main-bg {margin:0 0 0 0;background-color:#F2F2F2;font-family:Consolas;font-size:16px;}
|
||||
.div-spacer{width:16px;height:110px;display:block;margin-bottom:14px;position:relative}
|
||||
.div-episode{width:730px;height:110px;display:block;margin-bottom:14px;position:relative}
|
||||
.class-balken{width:735px;height:8px;display:block;margin-bottom:4px;margin-top:6px}
|
||||
.class-cc{width:36px;height:36px;display:block;margin-bottom:4px;margin-top:-6px;float: left;margin-left:-20px;}
|
||||
.imagestyle{width:156px;height:105px;display:block;margin-bottom:8px;margin-top:5px;margin-right: 10px;margin-left: 10px;float: left;}
|
||||
.spacediv{width:620px;height:175px;display:block;margin-bottom:4px}
|
||||
.ulStyle li{margin-left:12px;float:left;display:block;position:relative}
|
||||
.liOld{margin-left:12px;display:block}
|
||||
.ulStyle{margin:0 0 0 -10px;display:block;position:relative;margin-top:8px}
|
||||
.listyle{width:156px;display:block;background:#fff;padding:16px;margin-bottom:14px;position:relative;background-color:#b5b3b3}
|
||||
.progressbar{width:540px;height:20px;background:#dedede;margin-left: 170px;margin-top:8px;}
|
||||
.progressbar-value{background:#F78C25;height:20px;font-weight:bold;}
|
||||
.percenttext{float:right;text-align:right;font-size:16px;display:inline-block;margin-right:25px}
|
||||
.resotext{text-align: left;font-size:18px;margin-left:0px;font-weight:550;}
|
||||
.titel{font-size:18px;font-weight:550;display:block;margin-top:5px}
|
||||
.main_titel{font-size:18px;font-weight:550;display:block;text-align:center;margin-top:5px}
|
||||
.cc-wert{font-size:18px;font-weight:550;display:block;margin-top:-20px;margin-left:250px;text-decoration: none;color:black;}
|
||||
.liClass{margin-bottom:8px}
|
||||
</style>
|
||||
<body id="bodypage" class="main-bg" >
|
||||
<img alt="image error" src="balken.png" class="class-balken">
|
||||
<a class="main_titel">Deutsch</a>
|
||||
<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,83MB</span>
|
||||
<div>
|
||||
<br>
|
||||
<span dir="auto" class="resotext">1080p</span>
|
||||
|
||||
<a href="#" class="cc-wert" title="Softsubs:
|
||||
Deutsch"> <img alt="image error" src="cc.png" class="class-cc">Deutsch</a>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<img alt="image error" src="balken.png" class="class-balken"><!-- RWBY Staffel 2 Folge 4 5-->
|
||||
<script>
|
||||
|
||||
setInterval(function loadXMLDoc() {
|
||||
var xhttp = new XMLHttpRequest();
|
||||
xhttp.onreadystatechange = function() {
|
||||
if (this.readyState == 4 && this.status == 200) {
|
||||
document.getElementById("bodypage").innerHTML = this.responseText;
|
||||
//console.log(this.responseText);
|
||||
}
|
||||
};
|
||||
xhttp.open("GET", "/", true);
|
||||
xhttp.send();
|
||||
}, 1000);
|
||||
</script>
|
||||
</body></html>
|
||||
@ -27,7 +27,7 @@
|
||||
.liClass{margin-bottom:8px}
|
||||
</style>
|
||||
<body id="bodypage" class="main-bg" >
|
||||
<a class="main_titel">Status: no video found</a>
|
||||
<a class="main_titel">Crunchyroll Downloader</a>
|
||||
<img alt="image error" src="balken.png" class="class-balken">
|
||||
|
||||
<script>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user