mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-06-01 15:28:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to specify download directory for assets (#989)

Browse source 
Co-authored-by: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
This commit is contained in:
Lucas LaBuff 2023-02-17 13:48:20 -05:00 • committed by GitHub
parent 53ff8ba430
commit 95115f3e99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
DiscordChatExporter.Core/Exporting/ExportContext.cs
View file

@ -92,13 +92,19 @@ internal class ExportContext
try
{
var filePath = await _assetDownloader.DownloadAsync(url, cancellationToken);
var absoluteFilePath = await _assetDownloader.DownloadAsync(url, cancellationToken);
// We want relative path so that the output files can be copied around without breaking.
// Base directory path may be null if the file is stored at the root or relative to working directory.
var relativeFilePath = !string.IsNullOrWhiteSpace(Request.OutputBaseDirPath)
? Path.GetRelativePath(Request.OutputBaseDirPath, filePath)
: filePath;
? Path.GetRelativePath(Request.OutputBaseDirPath, absoluteFilePath)
: absoluteFilePath;
// If the assets path is outside of the export directory, fall back to absolute path
var filePath = relativeFilePath.StartsWith("..")
? absoluteFilePath
: relativeFilePath;
// HACK: for HTML, we need to format the URL properly
if (Request.Format is ExportFormat.HtmlDark or ExportFormat.HtmlLight)
@ -106,13 +112,14 @@ internal class ExportContext
// Need to escape each path segment while keeping the directory separators intact
return string.Join(
Path.AltDirectorySeparatorChar,
relativeFilePath
filePath
.Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
.Select(Uri.EscapeDataString)
.Select(x => x.Replace("%3A", ":"))
);
}
return relativeFilePath;
return filePath;
}
// Try to catch only exceptions related to failed HTTP requests
// https://github.com/Tyrrrz/DiscordChatExporter/issues/332

42
DiscordChatExporter.Core/Exporting/ExportRequest.cs
View file

@ -14,6 +14,7 @@ public partial record ExportRequest(
Guild Guild,
Channel Channel,
string OutputPath,
string? AssetsPath,
ExportFormat Format,
Snowflake? After,
Snowflake? Before,
@ -36,7 +37,18 @@ public partial record ExportRequest(
public string OutputBaseDirPath => Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
public string OutputAssetsDirPath => $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
private string? _outputAssetsDirPath;
public string OutputAssetsDirPath => _outputAssetsDirPath ??= (
AssetsPath is not null
? EvaluateTemplateTokens(
AssetsPath,
Guild,
Channel,
After,
Before
)
: $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}"
);
}
public partial record ExportRequest
@ -83,17 +95,15 @@ public partial record ExportRequest
return PathEx.EscapeFileName(buffer.ToString());
}
private static string GetOutputBaseFilePath(
private static string EvaluateTemplateTokens(
string path,
Guild guild,
Channel channel,
string outputPath,
ExportFormat format,
Snowflake? after = null,
Snowflake? before = null)
Snowflake? after,
Snowflake? before)
{
// Format path
var actualOutputPath = Regex.Replace(
outputPath,
return Regex.Replace(
path,
"%.",
m => PathEx.EscapeFileName(m.Value switch
{
@ -110,8 +120,18 @@ public partial record ExportRequest
"%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"),
"%%" => "%",
_ => m.Value
})
);
}));
}
private static string GetOutputBaseFilePath(
Guild guild,
Channel channel,
string outputPath,
ExportFormat format,
Snowflake? after = null,
Snowflake? before = null)
{
var actualOutputPath = EvaluateTemplateTokens(outputPath, guild, channel, after, before);
// Output is a directory
if (Directory.Exists(actualOutputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(actualOutputPath)))