mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-23 03:06:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[CLI] Allow passing after and before message ids instead of dates (#462)

Browse source
This commit is contained in:
Andrew Kolos 2020-12-22 10:41:40 -05:00 • committed by GitHub
parent 600c354ab2
commit 730fed075f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
View file

@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using CliFx;
using CliFx.Attributes;
@ -10,7 +11,7 @@ using DiscordChatExporter.Domain.Exporting;
namespace DiscordChatExporter.Cli.Commands.Base
{
public abstract class ExportCommandBase : TokenCommandBase
public abstract partial class ExportCommandBase : TokenCommandBase
{
[CommandOption("output", 'o',
Description = "Output file or directory path.")]
@ -21,12 +22,12 @@ namespace DiscordChatExporter.Cli.Commands.Base
public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark;
[CommandOption("after",
Description = "Only include messages sent after this date.")]
public DateTimeOffset? After { get; set; }
Description = "Only include messages sent after this date. Alternatively, provide the ID of a message.")]
public string? After { get; set; }
[CommandOption("before",
Description = "Only include messages sent before this date.")]
public DateTimeOffset? Before { get; set; }
Description = "Only include messages sent before this date. Alternatively, provide the ID of a message.")]
public string? Before { get; set; }
[CommandOption("partition", 'p',
Description = "Split output into partitions limited to this number of messages.")]
@ -56,8 +57,8 @@ namespace DiscordChatExporter.Cli.Commands.Base
channel,
OutputPath,
ExportFormat,
After,
Before,
ParseRangeOption(After, "--after"),
ParseRangeOption(Before, "--before"),
PartitionLimit,
ShouldDownloadMedia,
ShouldReuseMedia,
@ -86,12 +87,35 @@ namespace DiscordChatExporter.Cli.Commands.Base
{
if (ShouldReuseMedia && !ShouldDownloadMedia)
{
throw new CommandException(
"The --reuse-media option cannot be used without the --media option."
);
throw new CommandException("The --reuse-media option cannot be used without the --media option.");
}
return default;
}
}
public abstract partial class ExportCommandBase : TokenCommandBase
{
protected static DateTimeOffset? ParseRangeOption(string? value, string optionName)
{
if (value == null) return null;
var isSnowflake = Regex.IsMatch(value, @"^\d{18}$");
var isDate = DateTimeOffset.TryParse(value, out var datetime);
if (!isSnowflake && !isDate)
{
throw new ArgumentException($"Value for ${optionName} must be either a date or a message ID.");
}
return isSnowflake ? ExtractDateTimeFromSnowflake() : datetime;
DateTimeOffset ExtractDateTimeFromSnowflake()
{
var unixTimestampMs = (long.Parse(value) / 4194304 + 1420070400000);
return DateTimeOffset.FromUnixTimeMilliseconds(unixTimestampMs);
}
}
}
}

4
DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs
View file

@ -47,8 +47,8 @@ namespace DiscordChatExporter.Cli.Commands.Base
channel,
OutputPath,
ExportFormat,
After,
Before,
ParseRangeOption(After, "--after"),
ParseRangeOption(Before, "--before"),
PartitionLimit,
ShouldDownloadMedia,
ShouldReuseMedia,