paulmataruso/qbtmud
1
0
Fork 0
mirror of https://github.com/lantean-code/qbtmud.git synced 2025-10-22 20:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
ahjephson
2024-06-03 08:04:09 +01:00
parent b7c057468d
commit f49b876666
48 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Lantean.QBTMudBlade/Components/Dialogs/ManageTagsDialog.razor.cs
View File

@@ -1,7 +1,6 @@
using Lantean.QBitTorrentClient;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using static MudBlazor.CategoryTypes;
namespace Lantean.QBTMudBlade.Components.Dialogs
{

4
Lantean.QBTMudBlade/Components/DynamicTable.razor.cs
View File

@@ -1,10 +1,6 @@
using Blazored.LocalStorage;
using Lantean.QBitTorrentClient.Models;
using Lantean.QBTMudBlade.Models;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using System.Data.Common;
using static MudBlazor.CategoryTypes;
namespace Lantean.QBTMudBlade.Components
{

2
Lantean.QBTMudBlade/Components/FakeNavLink.razor.cs
View File

@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using MudBlazor;
using MudBlazor.Utilities;
@@ -32,7 +31,6 @@ namespace Lantean.QBTMudBlade.Components
[Parameter]
public Color IconColor { get; set; } = Color.Default;
[Parameter]
public string? Target { get; set; }

2
Lantean.QBTMudBlade/Components/FilesTab.razor.cs
View File

@@ -192,7 +192,7 @@ namespace Lantean.QBTMudBlade.Components
{
files = await ApiClient.GetTorrentContents(Hash);
}
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden || exception.StatusCode == HttpStatusCode.NotFound)
{
_timerCancellationToken.CancelIfNotDisposed();
return;

3
Lantean.QBTMudBlade/Components/FiltersNav.razor.cs
View File

@@ -1,8 +1,6 @@
using Blazored.LocalStorage;
using Lantean.QBTMudBlade.Models;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using static MudBlazor.Colors;
namespace Lantean.QBTMudBlade.Components
{
@@ -68,7 +66,6 @@ namespace Lantean.QBTMudBlade.Components
await CategoryChanged.InvokeAsync(category);
}
var tag = await LocalStorage.GetItemAsStringAsync(_tagSelectionStorageKey);
if (tag is not null)
{

2
Lantean.QBTMudBlade/Components/GeneralTab.razor.cs
View File

@@ -70,7 +70,7 @@ namespace Lantean.QBTMudBlade.Components
Pieces = await ApiClient.GetTorrentPieceStates(Hash);
Properties = await ApiClient.GetTorrentProperties(Hash);
}
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden || exception.StatusCode == HttpStatusCode.NotFound)
{
_timerCancellationToken.CancelIfNotDisposed();
return;

1
Lantean.QBTMudBlade/Components/Menu.razor.cs
View File

@@ -1,7 +1,6 @@
using Lantean.QBitTorrentClient;
using Lantean.QBitTorrentClient.Models;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using MudBlazor;
namespace Lantean.QBTMudBlade.Components

4
Lantean.QBTMudBlade/Components/Options/ConnectionOptions.razor.cs
View File

@@ -1,6 +1,4 @@
using System.Numerics;
namespace Lantean.QBTMudBlade.Components.Options
namespace Lantean.QBTMudBlade.Components.Options
{
public partial class ConnectionOptions : Options
{

4
Lantean.QBTMudBlade/Components/Options/SpeedOptions.razor.cs
View File

@@ -1,6 +1,4 @@
using ByteSizeLib;
namespace Lantean.QBTMudBlade.Components.Options
namespace Lantean.QBTMudBlade.Components.Options
{
public partial class SpeedOptions : Options
{

2
Lantean.QBTMudBlade/Components/PeersTab.razor.cs
View File

@@ -71,7 +71,7 @@ namespace Lantean.QBTMudBlade.Components
{
peers = await ApiClient.GetTorrentPeersData(Hash, _requestId);
}
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden || exception.StatusCode == HttpStatusCode.NotFound)
{
_timerCancellationToken.CancelIfNotDisposed();
return;

2
Lantean.QBTMudBlade/Components/PieceProgress.razor.cs
View File

@@ -2,8 +2,8 @@
using Lantean.QBTMudBlade.Interop;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MudBlazor.Services;
using MudBlazor;
using MudBlazor.Services;
namespace Lantean.QBTMudBlade.Components
{

2
Lantean.QBTMudBlade/Components/SortLabel.razor.cs
View File

@@ -1,7 +1,6 @@
using Microsoft.AspNetCore.Components;
using MudBlazor;
using MudBlazor.Utilities;
using static MudBlazor.CategoryTypes;
namespace Lantean.QBTMudBlade.Components
{
@@ -54,7 +53,6 @@ namespace Lantean.QBTMudBlade.Components
return;
}
SortDirection sortDirection;
switch (SortDirection)
{

6
Lantean.QBTMudBlade/Components/TorrentActions.razor.cs
View File

@@ -4,7 +4,6 @@ using Lantean.QBTMudBlade.Interop;
using Lantean.QBTMudBlade.Models;
using Lantean.QBTMudBlade.Services;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.JSInterop;
using MudBlazor;
@@ -327,22 +326,27 @@ namespace Lantean.QBTMudBlade.Components
/// Renders toolbar contents without the <see cref="MudToolBar"/> wrapper.
/// </summary>
ToolbarContents,
/// <summary>
/// Renders a <see cref="MudToolBar"/>.
/// </summary>
Toolbar,
/// <summary>
/// Renders a <see cref="MudMenu"/>.
/// </summary>
Menu,
/// <summary>
/// Renders a <see cref="MudToolBar"/> with <see cref="MudIconButton"/> for basic actions and a <see cref="MudMenu"/> for actions with children.
/// </summary>
MixedToolbarContents,
/// <summary>
/// Renders toolbar contents without the <see cref="MudToolBar"/> wrapper with <see cref="MudIconButton"/> for basic actions and a <see cref="MudMenu"/> for actions with children.
/// </summary>
MixedToolbar,
InitialIconsOnly,
Children,
}

2
Lantean.QBTMudBlade/Components/TrackersTab.razor.cs
View File

@@ -59,7 +59,7 @@ namespace Lantean.QBTMudBlade.Components
{
Trackers = await ApiClient.GetTorrentTrackers(Hash);
}
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden || exception.StatusCode == HttpStatusCode.NotFound)
{
_timerCancellationToken.CancelIfNotDisposed();
return;

2
Lantean.QBTMudBlade/Components/WebSeedsTab.razor.cs
View File

@@ -65,7 +65,7 @@ namespace Lantean.QBTMudBlade.Components
{
WebSeeds = await ApiClient.GetTorrentWebSeeds(Hash);
}
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden || exception.StatusCode == HttpStatusCode.NotFound)
{
_timerCancellationToken.CancelIfNotDisposed();
return;

1
Lantean.QBTMudBlade/DialogHelper.cs
View File

@@ -4,7 +4,6 @@ using Lantean.QBTMudBlade.Components.Dialogs;
using Lantean.QBTMudBlade.Filter;
using Lantean.QBTMudBlade.Models;
using MudBlazor;
using System.Collections.Generic;
namespace Lantean.QBTMudBlade
{

12
Lantean.QBTMudBlade/DisplayHelpers.cs
View File

@@ -2,7 +2,6 @@
using Lantean.QBTMudBlade.Models;
using MudBlazor;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Text;
namespace Lantean.QBTMudBlade
@@ -341,32 +340,43 @@ namespace Lantean.QBTMudBlade
case "forcedMetaDL":
case "downloading":
return (Icons.Material.Filled.Downloading, Color.Success);
case "forcedUP":
case "uploading":
return (Icons.Material.Filled.Upload, Color.Info);
case "stalledUP":
return (Icons.Material.Filled.KeyboardDoubleArrowUp, Color.Info);
case "stalledDL":
return (Icons.Material.Filled.KeyboardDoubleArrowDown, Color.Success);
case "pausedDL":
return (Icons.Material.Filled.Pause, Color.Success);
case "pausedUP":
return (Icons.Material.Filled.Pause, Color.Info);
case "queuedDL":
case "queuedUP":
return (Icons.Material.Filled.Queue, Color.Default);
case "checkingDL":
case "checkingUP":
return (Icons.Material.Filled.Loop, Color.Info);
case "queuedForChecking":
case "checkingResumeData":
return (Icons.Material.Filled.Loop, Color.Warning);
case "moving":
return (Icons.Material.Filled.Moving, Color.Info);
case "error":
case "unknown":
case "missingFiles":
return (Icons.Material.Filled.Error, Color.Error);
default:
return (Icons.Material.Filled.QuestionMark, Color.Warning);
}

3
Lantean.QBTMudBlade/Extensions.cs
View File

@@ -1,5 +1,4 @@
using Lantean.QBTMudBlade;
using Lantean.QBTMudBlade.Models;
using Lantean.QBTMudBlade.Models;
namespace Lantean.QBTMudBlade
{

1
Lantean.QBTMudBlade/FilterHelper.cs
View File

@@ -171,7 +171,6 @@ namespace Lantean.QBTMudBlade
public static bool FilterStatus(string state, long uploadSpeed, Status status)
{
bool inactive = false;
switch (status)
{

1
Lantean.QBTMudBlade/Layout/DetailsLayout.razor.cs
View File

@@ -18,7 +18,6 @@ namespace Lantean.QBTMudBlade.Layout
[CascadingParameter(Name = "SortDirection")]
public SortDirection SortDirection { get; set; }
protected string? SelectedTorrent { get; set; }
protected override void OnParametersSet()

2
Lantean.QBTMudBlade/Models/ContentItem.cs
View File

@@ -21,7 +21,7 @@ namespace Lantean.QBTMudBlade.Models
Index = index;
Priority = priority;
Progress = progress;
Size = size;
Size = priority == Priority.DoNotDownload ? 0 : size;
Availability = availability;
IsFolder = isFolder;
Level = level;

6
Lantean.QBTMudBlade/Pages/Login.razor.cs
View File

@@ -32,11 +32,11 @@ namespace Lantean.QBTMudBlade.Pages
NavigationManager.NavigateTo("/");
}
catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.BadRequest)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.BadRequest)
{
ApiError = "Invalid username or password.";
}
catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
catch (HttpRequestException exception) when (exception.StatusCode == HttpStatusCode.Forbidden)
{
ApiError = "Requests from this client are currently unavailable.";
}
@@ -47,10 +47,12 @@ namespace Lantean.QBTMudBlade.Pages
}
#if DEBUG
protected override async Task OnInitializedAsync()
{
await DoLogin("admin", "23mIDZhvT");
}
#endif
}

2
Lantean.QBTMudBlade/Pages/Options.razor.cs
View File

@@ -130,5 +130,3 @@ namespace Lantean.QBTMudBlade.Pages
}
}
}

3
Lantean.QBTMudBlade/Program.cs
View File

@@ -1,10 +1,9 @@
using Blazored.LocalStorage;
using Lantean.QBitTorrentClient;
using Lantean.QBTMudBlade.Services;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using MudBlazor.Services;
using Blazored;
using Blazored.LocalStorage;
namespace Lantean.QBTMudBlade
{

1
Lantean.QBTMudBlade/Services/DataManager.cs
View File

@@ -616,7 +616,6 @@ namespace Lantean.QBTMudBlade.Services
progress = (float)downloaded / size;
}
if (!contents.TryGetValue(key, out var dir))
{
continue;

1
Lantean.QBTMudBlade/wwwroot/css/app.css
View File

@@ -109,7 +109,6 @@ td.no-wrap {
}
.field-switch {
}
.piecesbarWrapper {

1
Lantean.QBTMudBlade/wwwroot/js/piecesbar.js
View File

@@ -44,7 +44,6 @@ class PiecesBar {
MAX_CANVAS_WIDTH = 4096;
constructor(pieces, parameters) {
this.id = 'piecesbar_' + (window.qbt.piecesBarUniqueId++);
this.width = 0;
this.height = 0;

1
Lantean.QBitTorrentClient/ApiClient.cs
View File

@@ -1,5 +1,4 @@
using Lantean.QBitTorrentClient.Models;
using System;
using System.Net;
using System.Net.Http.Json;
using System.Text.Json;

1
Lantean.QBitTorrentClient/ApiClientExtensions.cs
View File

@@ -121,7 +121,6 @@ namespace Lantean.QBitTorrentClient
return apiClient.AddTorrentTags([tag], null, hashes.ToArray());
}
public static Task RecheckTorrent(this IApiClient apiClient, string hash)
{
return apiClient.RecheckTorrents(null, hash);

3
Lantean.QBitTorrentClient/Models/SaveLocation.cs
View File

@@ -1,5 +1,4 @@

namespace Lantean.QBitTorrentClient.Models
namespace Lantean.QBitTorrentClient.Models
{
public class SaveLocation
{