mirror of
https://github.com/JustArchiNET/ArchiSteamFarm.git
synced 2025-12-30 13:10:47 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
362c0c8634 | ||
|
|
cca631044a | ||
|
|
a7fd20e587 | ||
|
|
d6db96b0f7 | ||
|
|
1929686855 | ||
|
|
29a2778805 |
@@ -691,7 +691,16 @@ StackTrace:
|
||||
<data name="WarningPreReleaseVersion" xml:space="preserve">
|
||||
<value>Používáte verzi, která je novější než poslední vydaná verze pro váš kanál aktualizací. Vezměte prosím na vědomí, že verze před vydáním jsou určeny pro uživatele, kteří vědí, jak hlásit chyby, řešit problémy a poskytovat zpětnou vazbu - neposkytujeme pro ně žádnou technickou podporu.</value>
|
||||
</data>
|
||||
|
||||
|
||||
|
||||
<data name="BotStats" xml:space="preserve">
|
||||
<value>Aktuální využití paměti: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Procházení fronty doporučení #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Procházení fronty doporučení #{0} dokončeno.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -695,6 +695,12 @@ StackTrace:
|
||||
<value>Momentaner Arbeitsspeicherverbrauch: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Lösche Steam Entdeckungsliste #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Fertig mit Löschung der Steam Entdeckungsliste #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -179,7 +179,9 @@ StackTrace:
|
||||
<value>Αδυναμία ελέγχου για την τελευταία έκδοση!</value>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ErrorUpdateNoAssets" xml:space="preserve">
|
||||
<value>Αδυναμία συνέχειας με την ενημέρωση γιατί η συγκεκριμένη έκδοση δεν περιέχει καθόλου αρχεία!</value>
|
||||
</data>
|
||||
<data name="ErrorUserInputRunningInHeadlessMode" xml:space="preserve">
|
||||
<value>Λήφθηκε αίτημα για είσοδο από τον χρήστη, αλλά η διεργασία εκτελείται σε σιωπηλή λειτουργία!</value>
|
||||
</data>
|
||||
@@ -666,6 +668,12 @@ StackTrace:
|
||||
<value>Τρέχουσα χρήση μνήμης: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Εκκαθάριση σειράς ανακαλύψεων Steam #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Ολοκληρώθηκε η εκκαθάριση σειράς ανακαλύψεων Steam #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -693,6 +693,12 @@
|
||||
<value>Penggunaan memori saat ini: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Membersihkan antrian penemuan Steam #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Selesai membersihkan antrian penemuan Steam #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -689,7 +689,16 @@
|
||||
<data name="WarningPreReleaseVersion" xml:space="preserve">
|
||||
<value>Stai utilizzando una versione più recente dell'ultima versione rilasciata per il tuo canale di aggiornamento. Sei pregato di notare che le versioni pre-release sono dedicate agli utenti che sono capaci di segnalare bug, affrontare problemi e lasciare feedback - non sarà dato nessun supporto tecnico.</value>
|
||||
</data>
|
||||
|
||||
|
||||
|
||||
<data name="BotStats" xml:space="preserve">
|
||||
<value>Utilizzo di memoria corrente: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Inizio coda #{0} dell'elenco scoperte Steam...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Fine coda #{0} dell'elenco scoperte Steam.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -697,6 +697,12 @@ ASF 실행 파일의 이름이 적절한지 확인하시기 바랍니다!</value
|
||||
<value>현재 메모리 사용량: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>스팀 맞춤 대기열 #{0}을 지우는 중...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>스팀 맞춤 대기열 #{0}을 지웠습니다.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -692,6 +692,12 @@
|
||||
<value>Šiuo metu naudojama atminties: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Peržiūrima Steam atradimo eilė #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Baigta peržiūrėti Steam atradimo eilė #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -695,6 +695,12 @@ StackTrace:
|
||||
<value>Geheugen in gebruik: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Steam-ontdekkingswachtrij afwerken #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Steam-ontdekkingswachtrij voltooid #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -695,6 +695,12 @@ StackTrace:
|
||||
<value>Geheugen in gebruik: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Steam-ontdekkingswachtrij afwerken #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Steam-ontdekkingswachtrij voltooid #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -695,6 +695,12 @@
|
||||
<value>Текущее использование памяти: {0} МБ.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Очистка списка рекомендаций #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Очищен список рекомендаций #{0}.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -695,6 +695,12 @@ Yığın izleme:
|
||||
<value>Geçerli bellek kullanımı: {0} MB.</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Steam keşif kuyruğu #{0} temizleniyor...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>Steam keşif kuyruğu #{0} temizlenmesi bitti.</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -316,7 +316,7 @@
|
||||
<comment>{0} will be replaced by WCF command</comment>
|
||||
</data>
|
||||
<data name="ErrorWCFAddressAccessDeniedException" xml:space="preserve">
|
||||
<value>由于 AddressAccessDeniedException，无法启动 WCF 服务 ！如果你想要使用ASF提供的WCF服务，请用管理员身份运行，或者给予更高的权限。</value>
|
||||
<value>由于目标地址访问受拒绝，无法启动 WCF 服务 ！如果你想要使用ASF提供的WCF服务，请用管理员身份运行，或者给予更高的权限。</value>
|
||||
</data>
|
||||
<data name="WCFAnswered" xml:space="preserve">
|
||||
<value>WCF 命令相应︰ {0} 及 {1}</value>
|
||||
@@ -692,6 +692,12 @@
|
||||
<value>当前内存用量： {0} MB。</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>正在浏览Steam探索队列 #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>已完成Steam探索队列 #{0}。</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -692,6 +692,12 @@
|
||||
<value>當前記憶體使用量： {0} MB。</value>
|
||||
<comment>{0} will be replaced by number (in megabytes) of memory being used</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="ClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>正在執行 Steam 探索佇列 #{0}...</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
<data name="DoneClearingDiscoveryQueue" xml:space="preserve">
|
||||
<value>已完成 Steam 探索佇列 #{0}。</value>
|
||||
<comment>{0} will be replaced by queue number</comment>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@@ -35,11 +35,28 @@ namespace ArchiSteamFarm {
|
||||
|
||||
private static readonly ConcurrentHashSet<LoggingRule> ConsoleLoggingRules = new ConcurrentHashSet<LoggingRule>();
|
||||
|
||||
private static bool IsUsingCustomConfiguration;
|
||||
private static bool IsWaitingForUserInput;
|
||||
|
||||
internal static void EnableTraceLogging() {
|
||||
if (IsUsingCustomConfiguration || (LogManager.Configuration == null)) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool reload = false;
|
||||
foreach (LoggingRule rule in LogManager.Configuration.LoggingRules.Where(rule => rule.IsLoggingEnabledForLevel(LogLevel.Debug) && !rule.IsLoggingEnabledForLevel(LogLevel.Trace))) {
|
||||
rule.EnableLoggingForLevel(LogLevel.Trace);
|
||||
reload = true;
|
||||
}
|
||||
|
||||
if (reload) {
|
||||
LogManager.ReconfigExistingLoggers();
|
||||
}
|
||||
}
|
||||
|
||||
internal static void InitLoggers() {
|
||||
if (LogManager.Configuration != null) {
|
||||
// User provided custom NLog config, or we have it set already, so don't override it
|
||||
IsUsingCustomConfiguration = true;
|
||||
InitConsoleLoggers();
|
||||
LogManager.ConfigurationChanged += OnConfigurationChanged;
|
||||
return;
|
||||
|
||||
@@ -35,6 +35,7 @@ using System.ServiceProcess;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using ArchiSteamFarm.Localization;
|
||||
using NLog;
|
||||
using NLog.Targets;
|
||||
using SteamKit2;
|
||||
|
||||
@@ -155,6 +156,8 @@ namespace ArchiSteamFarm {
|
||||
|
||||
// If debugging is on, we prepare debug directory prior to running
|
||||
if (GlobalConfig.Debug) {
|
||||
Logging.EnableTraceLogging();
|
||||
|
||||
if (Directory.Exists(SharedInfo.DebugDirectory)) {
|
||||
try {
|
||||
Directory.Delete(SharedInfo.DebugDirectory, true);
|
||||
@@ -329,6 +332,7 @@ namespace ArchiSteamFarm {
|
||||
break;
|
||||
}
|
||||
|
||||
LogManager.Flush();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -434,7 +438,6 @@ namespace ArchiSteamFarm {
|
||||
}
|
||||
|
||||
ASF.ArchiLogger.LogFatalException((Exception) e.ExceptionObject);
|
||||
await Task.Delay(1000).ConfigureAwait(false); // For writing stuff to logs
|
||||
await Exit(1).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace ArchiSteamFarm {
|
||||
internal const string ServiceDescription = "ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.";
|
||||
internal const string ServiceName = "ArchiSteamFarm";
|
||||
internal const string StatisticsServer = "asf.justarchi.net";
|
||||
internal const string VersionNumber = "2.3.2.3";
|
||||
internal const string VersionNumber = "2.3.2.4";
|
||||
|
||||
internal static readonly Version Version = Assembly.GetEntryAssembly().GetName().Version;
|
||||
}
|
||||
|
||||
@@ -43,12 +43,12 @@ namespace ArchiSteamFarm {
|
||||
async e => await ExploreDiscoveryQueue().ConfigureAwait(false),
|
||||
null,
|
||||
TimeSpan.FromMinutes(1 + 0.2 * Bot.Bots.Count), // Delay
|
||||
TimeSpan.FromHours(8.1) // Period
|
||||
TimeSpan.FromHours(6.1) // Period
|
||||
);
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
SteamDiscoveryQueueTimer?.Dispose();
|
||||
SteamDiscoveryQueueTimer.Dispose();
|
||||
}
|
||||
|
||||
private async Task ExploreDiscoveryQueue() {
|
||||
@@ -56,9 +56,12 @@ namespace ArchiSteamFarm {
|
||||
return;
|
||||
}
|
||||
|
||||
Bot.ArchiLogger.LogGenericTrace(Strings.Starting);
|
||||
|
||||
for (byte i = 0; (i < MaxSingleQueuesDaily) && (await IsDiscoveryQueueAvailable().ConfigureAwait(false)).GetValueOrDefault(); i++) {
|
||||
HashSet<uint> queue = await Bot.ArchiWebHandler.GenerateNewDiscoveryQueue().ConfigureAwait(false);
|
||||
if ((queue == null) || (queue.Count == 0)) {
|
||||
Bot.ArchiLogger.LogGenericTrace(string.Format(Strings.ErrorIsEmpty, nameof(queue)));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -76,6 +79,8 @@ namespace ArchiSteamFarm {
|
||||
|
||||
Bot.ArchiLogger.LogGenericInfo(string.Format(Strings.DoneClearingDiscoveryQueue, i));
|
||||
}
|
||||
|
||||
Bot.ArchiLogger.LogGenericTrace(Strings.Done);
|
||||
}
|
||||
|
||||
private async Task<bool?> IsDiscoveryQueueAvailable() {
|
||||
@@ -96,6 +101,8 @@ namespace ArchiSteamFarm {
|
||||
return null;
|
||||
}
|
||||
|
||||
Bot.ArchiLogger.LogGenericTrace(text);
|
||||
|
||||
// It'd make more sense to check against "Come back tomorrow", but it might not cover out-of-the-event queue
|
||||
bool result = text.StartsWith("You can get ", StringComparison.Ordinal);
|
||||
return result;
|
||||
|
||||
@@ -28,7 +28,7 @@ deploy:
|
||||
- provider: GitHub
|
||||
tag: $(appveyor_repo_tag_name)
|
||||
release: ArchiSteamFarm V$(appveyor_repo_tag_name)
|
||||
description: '**NOTICE:** Pre-releases are experimental versions that often contain unpatched bugs, work-in-progress features or rewritten implementations. If you don''t consider yourself advanced user, please download **[latest stable release](https://github.com/JustArchi/ArchiSteamFarm/releases/latest)** instead. Pre-release versions are dedicated to users who know how to report bugs, deal with issues and give feedback - no technical support will be given. Check out ASF **[release cycle](https://github.com/JustArchi/ArchiSteamFarm/wiki/Release-cycle)** if you''d like to learn more.\n\n---\n\nThis is automated AppVeyor GitHub deployment, human-readable changelog should be available soon. In the meantime please refer to **[GitHub commits](https://github.com/JustArchi/ArchiSteamFarm/commits/$(appveyor_repo_tag_name))**.\n\n---\n\nASF is available for free. If you''re grateful for what we''re doing, please consider donating. Developing ASF requires massive amount of time and knowledge, especially when it comes to Steam (and its problems). Even 1$ is highly appreciated and shows that you care!\n\n [](https://www.patreon.com/JustArchi) [](https://www.paypal.me/JustArchi/1usd) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HD2P2P3WGS5Y4) [](https://blockchain.info/address/1Archi6M1r5b41Rvn1SY2FfJAzsrEUT7aT) [](https://steamcommunity.com/tradeoffer/new/?partner=46697991&token=0ix2Ruv_)'
|
||||
description: '**NOTICE:** Pre-releases are experimental versions that often contain unpatched bugs, work-in-progress features or rewritten implementations. If you don''t consider yourself advanced user, please download **[latest stable release](https://github.com/JustArchi/ArchiSteamFarm/releases/latest)** instead. Pre-release versions are dedicated to users who know how to report bugs, deal with issues and give feedback - no technical support will be given. Check out ASF **[release cycle](https://github.com/JustArchi/ArchiSteamFarm/wiki/Release-cycle)** if you''d like to learn more.\n\n---\n\nThis is automated AppVeyor GitHub deployment, human-readable changelog should be available soon. In the meantime please refer to **[GitHub commits](https://github.com/JustArchi/ArchiSteamFarm/commits/$(appveyor_repo_tag_name))**.\n\n---\n\nASF is available for free. If you''re grateful for what we''re doing, please consider donating. Developing ASF requires massive amount of time and knowledge, especially when it comes to Steam (and its problems). Even 1$ is highly appreciated and shows that you care!\n\n [](https://www.patreon.com/JustArchi) [](https://www.paypal.me/JustArchi/1usd) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HD2P2P3WGS5Y4) [](https://blockchain.info/payment_request?address=1Archi6M1r5b41Rvn1SY2FfJAzsrEUT7aT) [](https://steamcommunity.com/tradeoffer/new/?partner=46697991&token=0ix2Ruv_)'
|
||||
auth_token:
|
||||
secure: QC5gIDMvSpd43EG6qW8d1E3ZHiVU4aR7pbKQonXstjj/JtAABf5S1IbtoY4OsnOR
|
||||
artifact: /.*/
|
||||
|
||||
Reference in New Issue
Block a user