calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-02-01 15:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix relative path extraction in ExportContext when base directory is empty

Browse Source 
Fixes #437
Fixes #434
This commit is contained in:
Tyrrrz
2020-11-20 16:56:30 +02:00
parent 047dccef7f
commit 37fcee2f21
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DiscordChatExporter.Domain/Exporting/ExportContext.cs
View File

@@ -74,8 +74,11 @@ namespace DiscordChatExporter.Domain.Exporting
{
var filePath = await _mediaDownloader.DownloadAsync(url);
// We want relative path so that the output files can be copied around without breaking
var relativeFilePath = Path.GetRelativePath(Request.OutputBaseDirPath, filePath);
// 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;
// HACK: for HTML, we need to format the URL properly
if (Request.Format == ExportFormat.HtmlDark || Request.Format == ExportFormat.HtmlLight)