Skip to content

Fix subscription refresh cache fallback and peek classification #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
actx4gh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix subscription refresh cache fallback and peek classification #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Grayjay.ClientServer/Subscriptions/Algorithms/SmartSubscriptionAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public override List<SubscriptionTask> GetSubscriptionTasks(Dictionary<Subscript
else
{
if (peekTasks.Count < 100 && GrayjaySettings.Instance.Subscriptions.PeekChannelContents &&
task.Sub.LastPeekVideo.Year < 1971 || task.Sub.LastPeekVideo < task.Sub.LastVideoUpdate &&
(task.Sub.LastPeekVideo.Year < 1971 || task.Sub.LastPeekVideo < task.Sub.LastVideoUpdate) &&
task.Client.Capabilities.HasPeekChannelContents && task.Client.GetPeekChannelTypes().Contains(task.Type))
{
task.FromPeek = true;
Expand Down
20 changes: 8 additions & 12 deletions Grayjay.ClientServer/Subscriptions/Algorithms/SubscriptionsTaskFetchAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
SetProgress(finished, forkTasks.Count);
if (!cachedChannels.Contains(task.Url))
{
return new SubscriptionTaskResult(task, null, null);
cachedChannels.Add(task.Url);
return new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null);
}
else
{
cachedChannels.Add(task.Url);
return new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null);
return new SubscriptionTaskResult(task, null, null);
}
}
}
Expand All @@ -334,7 +334,6 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
return new SubscriptionTaskResult(task, null, null); //skipped
}

Exception taskEx = null;
IPager<PlatformContent> pager = null;
try
{
Expand Down Expand Up @@ -390,8 +389,7 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
{
Logger.i(nameof(StateSubscriptions), $"Channel {task.Sub.Channel.Name} failed, substituting with cache");
pager = StateCache.GetChannelCachePager(task.Sub.Channel.Url);
taskEx = ex;
return new SubscriptionTaskResult(task, pager, taskEx);
return new SubscriptionTaskResult(task, pager, null);
}
}
});
Expand All @@ -411,13 +409,13 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
SetProgress(finished, forkTasks.Count);
if (!cachedChannels.Contains(task.Url))
{
source.SetResult(new SubscriptionTaskResult(task, null, null));
cachedChannels.Add(task.Url);
source.SetResult(new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null));
return;
}
else
{
cachedChannels.Add(task.Url);
source.SetResult(new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null));
source.SetResult(new SubscriptionTaskResult(task, null, null));
return;
}
}
Expand All @@ -430,7 +428,6 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
return;
}

Exception taskEx = null;
IPager<PlatformContent> pager = null;
try
{
Expand Down Expand Up @@ -487,8 +484,7 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
{
Logger.i(nameof(StateSubscriptions), $"Channel {task.Sub.Channel.Name} failed, substituting with cache");
pager = StateCache.GetChannelCachePager(task.Sub.Channel.Url);
taskEx = ex;
source.SetResult(new SubscriptionTaskResult(task, pager, taskEx));
source.SetResult(new SubscriptionTaskResult(task, pager, null));
return;
}
}
Expand Down