diff --git a/Shoko.Commons b/Shoko.Commons
index 2c98b28c..4eacefb9 160000
--- a/Shoko.Commons
+++ b/Shoko.Commons
@@ -1 +1 @@
-Subproject commit 2c98b28c1788f9e5effa85467cf70ddb2dce74d3
+Subproject commit 4eacefb9ed8f9531474bcf2564432bfb0a9dbb19
diff --git a/Shoko.Desktop/MainWindow.xaml b/Shoko.Desktop/MainWindow.xaml
index 6307b443..4a768cf2 100644
--- a/Shoko.Desktop/MainWindow.xaml
+++ b/Shoko.Desktop/MainWindow.xaml
@@ -194,13 +194,6 @@
-
-
-
-
-
-
-
@@ -523,138 +516,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1479,52 +1340,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
diff --git a/Shoko.Desktop/MainWindow.xaml.cs b/Shoko.Desktop/MainWindow.xaml.cs
index 59b53367..0dc4fc40 100644
--- a/Shoko.Desktop/MainWindow.xaml.cs
+++ b/Shoko.Desktop/MainWindow.xaml.cs
@@ -231,9 +231,6 @@ public MainWindow()
btnFeed.Click += btnFeed_Click;
btnDiscord.Click += btnDiscord_Click;
btnAbout.Click += btnAbout_Click;
- btnClearHasherQueue.Click += btnClearHasherQueue_Click;
- btnClearGeneralQueue.Click += btnClearGeneralQueue_Click;
- btnClearServerImageQueue.Click += btnClearServerImageQueue_Click;
btnAdminMessages.Click += btnAdminMessages_Click;
// timer for automatic updates
@@ -326,48 +323,6 @@ private void btnSwitchUser_Click(object sender, RoutedEventArgs e)
tabControl1.SelectedIndex = (int) TAB_MAIN.Dashboard;
}
- private void btnClearServerImageQueue_Click(object sender, RoutedEventArgs e)
- {
- try
- {
- Cursor = Cursors.Wait;
- VM_ShokoServer.Instance.ShokoServices.ClearImagesQueue();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- Cursor = Cursors.Arrow;
- }
-
- private void btnClearGeneralQueue_Click(object sender, RoutedEventArgs e)
- {
- try
- {
- Cursor = Cursors.Wait;
- VM_ShokoServer.Instance.ShokoServices.ClearGeneralQueue();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- Cursor = Cursors.Arrow;
- }
-
- private void btnClearHasherQueue_Click(object sender, RoutedEventArgs e)
- {
- try
- {
- Cursor = Cursors.Wait;
- VM_ShokoServer.Instance.ShokoServices.ClearHasherQueue();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- Cursor = Cursors.Arrow;
- }
-
private void btnFeed_Click(object sender, RoutedEventArgs e)
{
FeedForm frm = new FeedForm();
@@ -440,9 +395,6 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
VM_ShokoServer.Instance.Test();
VM_ShokoServer.Instance.BaseImagePath = Utils.GetBaseImagesPath();
- // Make the queue tooltip align left
- QueueTooltip.HorizontalOffset = QueueTooltip.Width - QueuePanel.Width;
-
bool loggedIn = false;
if (VM_ShokoServer.Instance.ServerOnline)
loggedIn = VM_ShokoServer.Instance.LoginAsLastUser();
@@ -2841,89 +2793,6 @@ public void CommandBinding_WindowMinimize(object sender, ExecutedRoutedEventArgs
WindowState = WindowState.Minimized;
}
-
- #region Server Queue Actions
-
- public void CommandBinding_HasherQueuePause(object sender, ExecutedRoutedEventArgs e)
- {
- try
- {
- VM_ShokoServer.Instance.ShokoServices.SetCommandProcessorHasherPaused(true);
- VM_ShokoServer.Instance.UpdateServerStatus();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- }
-
- public void CommandBinding_HasherQueueResume(object sender, ExecutedRoutedEventArgs e)
- {
- try
- {
- VM_ShokoServer.Instance.ShokoServices.SetCommandProcessorHasherPaused(false);
- VM_ShokoServer.Instance.UpdateServerStatus();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- }
-
- public void CommandBinding_GeneralQueuePause(object sender, ExecutedRoutedEventArgs e)
- {
- try
- {
- VM_ShokoServer.Instance.ShokoServices.SetCommandProcessorGeneralPaused(true);
- VM_ShokoServer.Instance.UpdateServerStatus();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- }
-
- public void CommandBinding_GeneralQueueResume(object sender, ExecutedRoutedEventArgs e)
- {
- try
- {
- VM_ShokoServer.Instance.ShokoServices.SetCommandProcessorGeneralPaused(false);
- VM_ShokoServer.Instance.UpdateServerStatus();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- }
-
- public void CommandBinding_ServerImageQueuePause(object sender, ExecutedRoutedEventArgs e)
- {
- try
- {
- VM_ShokoServer.Instance.ShokoServices.SetCommandProcessorImagesPaused(true);
- VM_ShokoServer.Instance.UpdateServerStatus();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- }
-
- public void CommandBinding_ServerImageQueueResume(object sender, ExecutedRoutedEventArgs e)
- {
- try
- {
- VM_ShokoServer.Instance.ShokoServices.SetCommandProcessorImagesPaused(false);
- VM_ShokoServer.Instance.UpdateServerStatus();
- }
- catch (Exception ex)
- {
- Utils.ShowErrorMessage(ex);
- }
- }
-
- #endregion
-
#endregion
public bool GroupFilter_GroupSearch(object obj)
diff --git a/Shoko.Desktop/ViewModel/VM_ShokoServer.cs b/Shoko.Desktop/ViewModel/VM_ShokoServer.cs
index 8c63e284..23c70d81 100644
--- a/Shoko.Desktop/ViewModel/VM_ShokoServer.cs
+++ b/Shoko.Desktop/ViewModel/VM_ShokoServer.cs
@@ -17,17 +17,13 @@
using Shoko.Commons.Languages;
using Shoko.Commons.Notification;
using Shoko.Commons.Properties;
-using Shoko.Commons.Queue;
using Shoko.Models.Enums;
using Shoko.Desktop.Forms;
-using Shoko.Desktop.Properties;
using Shoko.Desktop.Utilities;
-using Shoko.Desktop.ViewModel.Helpers;
using Shoko.Desktop.ViewModel.Server;
using Shoko.Models.Azure;
using Shoko.Models.Client;
using Shoko.Models.Interfaces;
-using Shoko.Models.Queue;
using Shoko.Models.Server;
using Shoko.Models.TvDB;
using ImportFolder = Shoko.Models.Server.ImportFolder;
@@ -631,16 +627,6 @@ public string BaseImagePath
}
}
- private bool baseImagesPathIsDefault = true;
- public bool BaseImagesPathIsDefault
- {
- get => baseImagesPathIsDefault;
- set
- {
- this.SetField(()=>baseImagesPathIsDefault,value);
- }
- }
-
private string username = "";
public string Username
{
@@ -651,126 +637,6 @@ public string Username
}
}
- private int hasherQueueCount;
- public int HasherQueueCount
- {
- get => hasherQueueCount;
- set
- {
- this.SetField(()=>hasherQueueCount,value);
- }
- }
-
- private string hasherQueueState = "";
- public string HasherQueueState
- {
- get => hasherQueueState;
- set
- {
- this.SetField(()=>hasherQueueState,value);
- }
- }
-
- private int serverImageQueueCount;
- public int ServerImageQueueCount
- {
- get => serverImageQueueCount;
- set
- {
- this.SetField(()=>serverImageQueueCount,value);
- }
- }
-
- private string serverImageQueueState = "";
- public string ServerImageQueueState
- {
- get => serverImageQueueState;
- set
- {
- this.SetField(()=>serverImageQueueState,value);
- }
- }
-
- private int generalQueueCount;
- public int GeneralQueueCount
- {
- get => generalQueueCount;
- set
- {
- this.SetField(()=>generalQueueCount,value);
- }
- }
-
- private string generalQueueState = "";
- public string GeneralQueueState
- {
- get => generalQueueState;
- set
- {
- this.SetField(()=>generalQueueState,value);
- }
- }
-
- private bool hasherQueuePaused;
- public bool HasherQueuePaused
- {
- get => hasherQueuePaused;
- set
- {
- this.SetField(()=>hasherQueuePaused,value);
- }
- }
-
- private bool hasherQueueRunning = true;
- public bool HasherQueueRunning
- {
- get => hasherQueueRunning;
- set
- {
- this.SetField(()=>hasherQueueRunning,value);
- }
- }
-
- private bool serverImageQueuePaused;
- public bool ServerImageQueuePaused
- {
- get => serverImageQueuePaused;
- set
- {
- this.SetField(()=>serverImageQueuePaused,value);
- }
- }
-
- private bool serverImageQueueRunning = true;
- public bool ServerImageQueueRunning
- {
- get => serverImageQueueRunning;
- set
- {
- this.SetField(()=>serverImageQueueRunning,value);
- }
- }
-
- private bool generalQueuePaused;
- public bool GeneralQueuePaused
- {
- get => generalQueuePaused;
- set
- {
- this.SetField(()=>generalQueuePaused,value);
- }
- }
-
- private bool generalQueueRunning;
- public bool GeneralQueueRunning
- {
- get => generalQueueRunning;
- set
- {
- this.SetField(()=>generalQueueRunning,value);
- }
- }
-
private bool serverOnline = true;
public bool ServerOnline
{
@@ -1830,22 +1696,6 @@ void updateServerStatus()
Application.Current.Dispatcher.Invoke(DispatcherPriority.Normal, (Action)delegate
{
- HasherQueueCount = status.HashQueueCount;
- GeneralQueueCount = status.GeneralQueueCount;
- ServerImageQueueCount = status.ImagesQueueCount;
-
- HasherQueueState = status.HashQueueMessage;
- HasherQueuePaused = (QueueStateEnum)status.HashQueueStateId == QueueStateEnum.Paused;
- HasherQueueRunning = (QueueStateEnum)status.HashQueueStateId != QueueStateEnum.Paused;
-
- GeneralQueueState = status.GeneralQueueMessage;
- GeneralQueuePaused = (QueueStateEnum)status.GeneralQueueStateId == QueueStateEnum.Paused;
- GeneralQueueRunning = (QueueStateEnum)status.GeneralQueueStateId != QueueStateEnum.Paused;
-
- ServerImageQueueState = status.ImagesQueueMessage;
- ServerImageQueuePaused = (QueueStateEnum)status.ImagesQueueStateId == QueueStateEnum.Paused;
- ServerImageQueueRunning = (QueueStateEnum)status.ImagesQueueStateId != QueueStateEnum.Paused;
-
IsBanned = status.IsBanned;
BanReason = status.BanReason;
BanOrigin = status.BanOrigin;