mirror of
https://github.com/Crunchy-DL/Crunchy-Downloader.git
synced 2026-05-19 16:31:48 +00:00
Fix - No drm streams
Fix - History missing episodes not counted correctly
This commit is contained in:
parent
b1964be6b0
commit
fbd16274a6
3 changed files with 39 additions and 28 deletions
|
|
@ -1397,6 +1397,7 @@ public class Crunchyroll{
|
||||||
|
|
||||||
private async Task FetchNoDrmPlaybackData(string currentMediaId, PlaybackData pbData){
|
private async Task FetchNoDrmPlaybackData(string currentMediaId, PlaybackData pbData){
|
||||||
var playbackRequestNonDrm = HttpClientReq.CreateRequestMessage($"https://cr-play-service.prd.crunchyrollsvc.com/v1/{currentMediaId}/console/switch/play", HttpMethod.Get, true, true, null);
|
var playbackRequestNonDrm = HttpClientReq.CreateRequestMessage($"https://cr-play-service.prd.crunchyrollsvc.com/v1/{currentMediaId}/console/switch/play", HttpMethod.Get, true, true, null);
|
||||||
|
playbackRequestNonDrm.Headers.UserAgent.ParseAdd("Crunchyroll/1.8.0 Nintendo Switch/12.3.12.0 UE4/4.27");
|
||||||
|
|
||||||
var playbackRequestNonDrmResponse = await HttpClientReq.Instance.SendHttpRequest(playbackRequestNonDrm);
|
var playbackRequestNonDrmResponse = await HttpClientReq.Instance.SendHttpRequest(playbackRequestNonDrm);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -353,7 +353,12 @@ public class HistorySeries : INotifyPropertyChanged{
|
||||||
|
|
||||||
// Iterate over the Episodes from the end to the beginning
|
// Iterate over the Episodes from the end to the beginning
|
||||||
for (int j = Seasons[i].EpisodesList.Count - 1; j >= 0 && !foundWatched; j--){
|
for (int j = Seasons[i].EpisodesList.Count - 1; j >= 0 && !foundWatched; j--){
|
||||||
if (!Seasons[i].EpisodesList[j].WasDownloaded && !Seasons[i].EpisodesList[j].SpecialEpisode){
|
|
||||||
|
if (Seasons[i].EpisodesList[j].SpecialEpisode){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Seasons[i].EpisodesList[j].WasDownloaded){
|
||||||
count++;
|
count++;
|
||||||
} else{
|
} else{
|
||||||
foundWatched = true;
|
foundWatched = true;
|
||||||
|
|
@ -376,7 +381,12 @@ public class HistorySeries : INotifyPropertyChanged{
|
||||||
|
|
||||||
// Iterate over the Episodes from the end to the beginning
|
// Iterate over the Episodes from the end to the beginning
|
||||||
for (int j = Seasons[i].EpisodesList.Count - 1; j >= 0 && !foundWatched; j--){
|
for (int j = Seasons[i].EpisodesList.Count - 1; j >= 0 && !foundWatched; j--){
|
||||||
if (!Seasons[i].EpisodesList[j].WasDownloaded && !Seasons[i].EpisodesList[j].SpecialEpisode){
|
|
||||||
|
if (Seasons[i].EpisodesList[j].SpecialEpisode){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Seasons[i].EpisodesList[j].WasDownloaded){
|
||||||
//ADD to download queue
|
//ADD to download queue
|
||||||
await Seasons[i].EpisodesList[j].DownloadEpisode();
|
await Seasons[i].EpisodesList[j].DownloadEpisode();
|
||||||
} else{
|
} else{
|
||||||
|
|
|
||||||
|
|
@ -5,34 +5,34 @@ namespace CRD.Utils.Structs;
|
||||||
|
|
||||||
public class CrDownloadOptions{
|
public class CrDownloadOptions{
|
||||||
[YamlMember(Alias = "hard_sub_lang", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "hard_sub_lang", ApplyNamingConventions = false)]
|
||||||
public string Hslang{ get; set; }
|
public string Hslang{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public int Kstream{ get; set; }
|
public int Kstream{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "no_video", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "no_video", ApplyNamingConventions = false)]
|
||||||
public bool Novids{ get; set; }
|
public bool Novids{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "no_audio", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "no_audio", ApplyNamingConventions = false)]
|
||||||
public bool Noaudio{ get; set; }
|
public bool Noaudio{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public int StreamServer{ get; set; }
|
public int StreamServer{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "quality_video", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "quality_video", ApplyNamingConventions = false)]
|
||||||
public string QualityVideo{ get; set; }
|
public string QualityVideo{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "quality_audio", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "quality_audio", ApplyNamingConventions = false)]
|
||||||
public string QualityAudio{ get; set; }
|
public string QualityAudio{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "file_name", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "file_name", ApplyNamingConventions = false)]
|
||||||
public string FileName{ get; set; }
|
public string FileName{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "leading_numbers", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "leading_numbers", ApplyNamingConventions = false)]
|
||||||
public int Numbers{ get; set; }
|
public int Numbers{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public int Partsize{ get; set; }
|
public int Partsize{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public int Timeout{ get; set; }
|
public int Timeout{ get; set; }
|
||||||
|
|
@ -44,58 +44,58 @@ public class CrDownloadOptions{
|
||||||
public int FsRetryTime{ get; set; }
|
public int FsRetryTime{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "soft_subs", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "soft_subs", ApplyNamingConventions = false)]
|
||||||
public List<string> DlSubs{ get; set; }
|
public List<string> DlSubs{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public bool SkipSubs{ get; set; }
|
public bool SkipSubs{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public bool NoSubs{ get; set; }
|
public bool NoSubs{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "mux_mp4", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "mux_mp4", ApplyNamingConventions = false)]
|
||||||
public bool Mp4{ get; set; }
|
public bool Mp4{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public List<string> Override{ get; set; }
|
public List<string> Override{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public string VideoTitle{ get; set; }
|
public string VideoTitle{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public string Force{ get; set; }
|
public string Force{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "mux_ffmpeg", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "mux_ffmpeg", ApplyNamingConventions = false)]
|
||||||
public List<string> FfmpegOptions{ get; set; }
|
public List<string> FfmpegOptions{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "mux_mkvmerge", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "mux_mkvmerge", ApplyNamingConventions = false)]
|
||||||
public List<string> MkvmergeOptions{ get; set; }
|
public List<string> MkvmergeOptions{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public LanguageItem DefaultSub{ get; set; }
|
public LanguageItem DefaultSub{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public LanguageItem DefaultAudio{ get; set; }
|
public LanguageItem DefaultAudio{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public string CcTag{ get; set; }
|
public string CcTag{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public bool DlVideoOnce{ get; set; }
|
public bool DlVideoOnce{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public bool? Skipmux{ get; set; }
|
public bool? Skipmux{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public bool SyncTiming{ get; set; }
|
public bool SyncTiming{ get; set; }
|
||||||
|
|
||||||
[YamlIgnore]
|
[YamlIgnore]
|
||||||
public bool Nocleanup{ get; set; }
|
public bool Nocleanup{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "chapters", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "chapters", ApplyNamingConventions = false)]
|
||||||
public bool Chapters{ get; set; }
|
public bool Chapters{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "dub_lang", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "dub_lang", ApplyNamingConventions = false)]
|
||||||
public List<string> DubLang{ get; set; }
|
public List<string> DubLang{ get; set; }
|
||||||
|
|
||||||
[YamlMember(Alias = "simultaneous_downloads", ApplyNamingConventions = false)]
|
[YamlMember(Alias = "simultaneous_downloads", ApplyNamingConventions = false)]
|
||||||
public int SimultaneousDownloads{ get; set; }
|
public int SimultaneousDownloads{ get; set; }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue