Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Remove obsolete ICustomMachineInfoProvider interface""

Browse Source 
This reverts commit 19ffe6e761.
This commit is contained in:
Archi
2023-06-25 12:54:40 +02:00
parent 549bd2f0be
commit 5abe69162d
2 changed files with 1 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ArchiSteamFarm/Plugins/Interfaces/ICustomMachineInfoProvider.cs
View File

@@ -1,37 +0,0 @@
// _ _ _ ____ _ _____
// / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___
// / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \
// / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | |
// /_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_|
// |
// Copyright 2015-2023 Łukasz "JustArchi" Domeradzki
// Contact: JustArchi@JustArchi.net
// |
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// |
// http://www.apache.org/licenses/LICENSE-2.0
// |
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
using JetBrains.Annotations;
using SteamKit2;
namespace ArchiSteamFarm.Plugins.Interfaces;
[Obsolete($"Use {nameof(IBotCustomMachineInfoProvider)} instead, this interface will be removed in the future version")]
[PublicAPI]
public interface ICustomMachineInfoProvider : IPlugin {
/// <summary>
/// ASF will use this property as the <see cref="IMachineInfoProvider" /> for the bots.
/// Unless you know what you're doing, you should not implement this property yourself and let ASF decide.
/// </summary>
/// <returns><see cref="IMachineInfoProvider" /> that will be used for the bots.</returns>
IMachineInfoProvider MachineInfoProvider { get; }
}

23
ArchiSteamFarm/Plugins/PluginsCore.cs
View File

@@ -154,9 +154,7 @@ public static class PluginsCore {
return null;
}
#pragma warning disable CS0612 // TODO: Fair warning, remove ?? fallback in the next release cycle
return results.FirstOrDefault(static result => result != null) ?? await GetCustomMachineInfoProviderFallback().ConfigureAwait(false);
#pragma warning restore CS0612 // TODO: Fair warning, remove ?? fallback in the next release cycle
return results.FirstOrDefault(static result => result != null);
}
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
@@ -655,25 +653,6 @@ public static class PluginsCore {
}
}
[Obsolete]
private static async Task<IMachineInfoProvider?> GetCustomMachineInfoProviderFallback() {
if (ActivePlugins == null) {
return null;
}
IList<IMachineInfoProvider> results;
try {
results = await Utilities.InParallel(ActivePlugins.OfType<ICustomMachineInfoProvider>().Select(static plugin => Task.Run(() => plugin.MachineInfoProvider))).ConfigureAwait(false);
} catch (Exception e) {
ASF.ArchiLogger.LogGenericException(e);
return null;
}
return results.FirstOrDefault();
}
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
private static HashSet<Assembly>? LoadAssembliesFrom(string path) {
if (string.IsNullOrEmpty(path)) {