Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions ArcdpsLogManager/Configuration/DpsReportUploadSettingsPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class DpsReportUploadSettingsPage : SettingsPage
private readonly RadioButtonList domainList;
private readonly CheckBox uploadDetailedWvwCheckbox;
private readonly CheckBox autoUploadCheckbox;
private readonly CheckBox autoUploadApplyFiltersCheckbox;

private bool EditingUserToken { get; set; }

Expand Down Expand Up @@ -54,6 +55,11 @@ public DpsReportUploadSettingsPage()
uploadDetailedWvwCheckbox = new CheckBox { Text = "Detailed WVW Reports (large files may fail)", Checked = Settings.DpsReportUploadDetailedWvw };

autoUploadCheckbox = new CheckBox { Text = "Automatically upload logs", Checked = Settings.DpsReportAutoUpload };
autoUploadApplyFiltersCheckbox = new CheckBox { Text = "Only upload successful encounters", Checked = Settings.DpsReportAutoUploadApplyFilters, Enabled = Settings.DpsReportAutoUpload };
autoUploadCheckbox.CheckedChanged += (sender, args) =>
{
autoUploadApplyFiltersCheckbox.Enabled = autoUploadCheckbox.Checked.Value;
};

var userTokenTextBox = new TextBox { ReadOnly = true, Text = "************", Enabled = false };

Expand Down Expand Up @@ -102,6 +108,7 @@ public DpsReportUploadSettingsPage()
Wrap = WrapMode.Word,
});
layout.AddRow(autoUploadCheckbox);
layout.AddRow(autoUploadApplyFiltersCheckbox);
}
layout.EndGroup();

Expand Down Expand Up @@ -162,6 +169,11 @@ public override void SaveSettings()
{
Settings.DpsReportAutoUpload = autoUploadCheckbox.Checked.Value;
}

if (autoUploadApplyFiltersCheckbox.Checked.HasValue)
{
Settings.DpsReportAutoUploadApplyFilters = autoUploadApplyFiltersCheckbox.Checked.Value;
}
}
}
}
23 changes: 20 additions & 3 deletions ArcdpsLogManager/Configuration/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public static class Settings
DpsReportUserTokenChanged += (sender, args) => SaveToFile();
DpsReportDomainChanged += (sender, args) => SaveToFile();
DpsReportAutoUploadChanged += (sender, args) => SaveToFile();
DpsReportAutoUploadApplyFiltersChanged += (sender, args) => SaveToFile();
MinimumLogDurationSecondsChanged += (sender, args) => SaveToFile();
IgnoredUpdateVersionsChanged += (sender, args) => SaveToFile();
DpsReportUploadDetailedWvwChanged += (sender, args) => SaveToFile();
Expand Down Expand Up @@ -280,7 +281,18 @@ public static bool DpsReportAutoUpload
}
}
}

public static bool DpsReportAutoUploadApplyFilters
{
get => Values.DpsReportAutoUploadApplyFilters;
set
{
if (Values.DpsReportAutoUploadApplyFilters != value)
{
Values.DpsReportAutoUploadApplyFilters = value;
OnDpsReportAutoUploadApplyFiltersChanged();
}
}
}
public static bool DpsReportUploadDetailedWvw
{
get => Values.DpsReportUploadDetailedWvw;
Expand All @@ -293,7 +305,6 @@ public static bool DpsReportUploadDetailedWvw
}
}
}

public static IReadOnlyList<string> PlayerAccountNames
{
get => Values.PlayerAccountNames;
Expand Down Expand Up @@ -331,6 +342,7 @@ public static IReadOnlyList<EncounterCategory> WeeklyClearGroups
public static event EventHandler<EventArgs> DpsReportUserTokenChanged;
public static event EventHandler<EventArgs> DpsReportDomainChanged;
public static event EventHandler<EventArgs> DpsReportAutoUploadChanged;
public static event EventHandler<EventArgs> DpsReportAutoUploadApplyFiltersChanged;
public static event EventHandler<EventArgs> MinimumLogDurationSecondsChanged;
public static event EventHandler<EventArgs> IgnoredUpdateVersionsChanged;
public static event EventHandler<EventArgs> DpsReportUploadDetailedWvwChanged;
Expand Down Expand Up @@ -382,6 +394,11 @@ private static void OnDpsReportAutoUploadChanged()
DpsReportAutoUploadChanged?.Invoke(null, EventArgs.Empty);
}

private static void OnDpsReportAutoUploadApplyFiltersChanged()
{
DpsReportAutoUploadApplyFiltersChanged?.Invoke(null, EventArgs.Empty);
}

private static void OnMinimumLogDurationSecondsChanged()
{
MinimumLogDurationSecondsChanged?.Invoke(null, EventArgs.Empty);
Expand All @@ -406,7 +423,7 @@ private static void OnDpsReportUploadDetailedWvwChanged()
{
DpsReportUploadDetailedWvwChanged?.Invoke(null, EventArgs.Empty);
}

private static void OnPlayerAccountNamesChanged()
{
PlayerAccountNamesChanged?.Invoke(null, EventArgs.Empty);
Expand Down
1 change: 1 addition & 0 deletions ArcdpsLogManager/Configuration/StoredSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class StoredSettings
public string DpsReportDomain { get; set; } = DpsReportUploader.DefaultDomain.Domain;
public bool DpsReportAutoUpload { get; set; } = false;
public bool DpsReportUploadDetailedWvw { get; set; } = false;
public bool DpsReportAutoUploadApplyFilters { get; set; } = true;
public int? MinimumLogDurationSeconds { get; set; } = null;

public List<string> HiddenLogListColumns { get; set; } =
Expand Down
7 changes: 6 additions & 1 deletion ArcdpsLogManager/ManagerForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,13 @@ public ManagerForm(LogCache logCache, ApiData apiData)
{
if (Settings.DpsReportAutoUpload)
{
bool filtersMatch = true;
if (Settings.DpsReportAutoUploadApplyFilters)
{
filtersMatch = args.Item.EncounterResult == EVTCAnalytics.Processing.Encounters.Results.EncounterResult.Success;
}
var age = DateTimeOffset.Now - args.Item.EncounterStartTime;
if (age < TimeSpan.FromDays(1))
if (age < TimeSpan.FromDays(1) && filtersMatch)
{
UploadProcessor.ScheduleDpsReportEIUpload(args.Item);
}
Expand Down