Skip to content

Stagger items in the queue list based on length and source #1

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
HMFons wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stagger items in the queue list based on length and source #1

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
Binary file added .vs/HandBrake/v17/.wsuo
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions .vs/VSWorkspaceState.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\HandBrake.sln",
"PreviewInSolutionExplorer": false
}
9 changes: 9 additions & 0 deletions win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions win/CS/HandBrakeWPF/Properties/Resources.nl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,9 @@ VLC en MPC-HC worden ondersteund. Andere mediaspelers werken mogelijk ook, maar
<data name="QueueView_ResetAllJobs" xml:space="preserve">
<value>Alle taken opnieuw uitvoeren</value>
</data>
<data name="QueueView_StaggerJobs" xml:space="preserve">
<value>Alle taken spreiden</value>
</data>
<data name="QueueView_ResetFailed" xml:space="preserve">
<value>Herhaalde uitvoering mislukt</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions win/CS/HandBrakeWPF/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2809,4 +2809,7 @@ To allow multiple simultaneous encodes, turn on "Process Isolation" in Tools Men
<data name="AudioView_QualityMode" xml:space="preserve">
<value>Audio Encoder Quality Mode</value>
</data>
<data name="QueueView_StaggerJobs" xml:space="preserve">
<value>Stagger all jobs</value>
</data>
</root>
5 changes: 5 additions & 0 deletions win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ public interface IQueueService
/// </summary>
void MoveToTop(IList<QueueTask> moveItems);

/// <summary>
/// Stagger items in the queue list based on length and source
/// </summary>
void Stagger();

/// <summary>
/// Remove a job from the Queue.
/// This method is Thread Safe
Expand Down
23 changes: 23 additions & 0 deletions win/CS/HandBrakeWPF/Services/Queue/QueueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,29 @@ public void MoveToTop(IList<QueueTask> moveItems)

this.InvokeQueueChanged(EventArgs.Empty);
}
public void Stagger()
{
lock (QueueLock)
{
var total = this.queue.Count;
var grouped = this.queue.OrderByDescending(x => x.Task.ChapterNames.Count)
.GroupBy(x => x.ScannedSourcePath[0])
.Select(g => g.ToList())
.ToList();
this.queue.Clear();
for (int i = 0; this.queue.Count < total; i++)
{
var group = grouped[i % grouped.Count];
if (group.Any())
{
this.queue.Add(group.First());
group.RemoveAt(0);
}
}
}

this.InvokeQueueChanged(EventArgs.Empty);
}

public void Remove(QueueTask job)
{
Expand Down
7 changes: 6 additions & 1 deletion win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,12 @@ public void ResetAllJobs()
}
}
}


public void StaggerJobs()
{
this.queueProcessor.Stagger();
}

public void ResetFailed()
{
foreach (var task in this.QueueTasks)
Expand Down
1 change: 1 addition & 0 deletions win/CS/HandBrakeWPF/Views/QueueView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
<MenuItem Command="{Binding RelayCommand}" CommandParameter="ResetFailed" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />
<MenuItem Command="{Binding RelayCommand}" CommandParameter="ResetSelectedJobs" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />
<MenuItem Command="{Binding RelayCommand}" CommandParameter="ResetAllJobs" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />
<MenuItem Command="{Binding RelayCommand}" CommandParameter="StaggerJobs" Header="{x:Static Properties:Resources.QueueView_StaggerJobs}" />
<Separator />
<MenuItem Command="{Binding RelayCommand}" CommandParameter="ClearCompleted" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
<MenuItem Command="{Binding RelayCommand}" CommandParameter="Clear" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
Expand Down