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

Refactor string checks and fix exception when exporting multiple channels

Browse source 
Fix #164
This commit is contained in:
Alexey Golub 2019-04-11 22:56:29 +03:00
parent 7951703cf2
commit 30cba7959f
20 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
View file

@ -13,7 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Stylet" Version="1.1.22" /> <PackageReference Include="Stylet" Version="1.1.22" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" /> <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs
View file

@ -24,7 +24,7 @@ namespace DiscordChatExporter.Cli.Verbs
var exportService = Container.Instance.Get<ExportService>(); var exportService = Container.Instance.Get<ExportService>();
// Configure settings // Configure settings
if (!Options.DateFormat.EmptyIfNull().IsWhiteSpace()) if (!Options.DateFormat.IsNullOrWhiteSpace())
settingsService.DateFormat = Options.DateFormat; settingsService.DateFormat = Options.DateFormat;
// Track progress // Track progress
@ -37,7 +37,7 @@ namespace DiscordChatExporter.Cli.Verbs
// Generate file path if not set or is a directory // Generate file path if not set or is a directory
var filePath = Options.OutputPath; var filePath = Options.OutputPath;
if (filePath.EmptyIfNull().IsWhiteSpace() || ExportHelper.IsDirectoryPath(filePath)) if (filePath.IsNullOrWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
{ {
// Generate default file name // Generate default file name
var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild, var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,

2
DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs
View file

@ -27,7 +27,7 @@ namespace DiscordChatExporter.Cli.Verbs
var exportService = Container.Instance.Get<ExportService>(); var exportService = Container.Instance.Get<ExportService>();
// Configure settings // Configure settings
if (!Options.DateFormat.EmptyIfNull().IsWhiteSpace()) if (!Options.DateFormat.IsNullOrWhiteSpace())
settingsService.DateFormat = Options.DateFormat; settingsService.DateFormat = Options.DateFormat;
// Get channels // Get channels

2
DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs
View file

@ -28,7 +28,7 @@ namespace DiscordChatExporter.Cli.Verbs
var exportService = Container.Instance.Get<ExportService>(); var exportService = Container.Instance.Get<ExportService>();
// Configure settings // Configure settings
if (!Options.DateFormat.EmptyIfNull().IsWhiteSpace()) if (!Options.DateFormat.IsNullOrWhiteSpace())
settingsService.DateFormat = Options.DateFormat; settingsService.DateFormat = Options.DateFormat;
// Get channels // Get channels

2
DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj
View file

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" /> <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
DiscordChatExporter.Core.Markdown/MarkdownParser.cs
View file

@ -113,7 +113,7 @@ namespace DiscordChatExporter.Core.Markdown
// Capture <:lul:123456> or <a:lul:123456> // Capture <:lul:123456> or <a:lul:123456>
private static readonly IMatcher<Node> CustomEmojiNodeMatcher = new RegexMatcher<Node>( private static readonly IMatcher<Node> CustomEmojiNodeMatcher = new RegexMatcher<Node>(
new Regex("<(a)?:(.+?):(\\d+?)>", DefaultRegexOptions), new Regex("<(a)?:(.+?):(\\d+?)>", DefaultRegexOptions),
m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, !m.Groups[1].Value.IsEmpty())); m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, !m.Groups[1].Value.IsNullOrWhiteSpace()));
/* Links */ /* Links */

6
DiscordChatExporter.Core.Markdown/Nodes/EmojiNode.cs
View file

@ -1,4 +1,6 @@
namespace DiscordChatExporter.Core.Markdown.Nodes using Tyrrrz.Extensions;
namespace DiscordChatExporter.Core.Markdown.Nodes
{ {
public class EmojiNode : Node public class EmojiNode : Node
{ {
@ -8,7 +10,7 @@
public bool IsAnimated { get; } public bool IsAnimated { get; }
public bool IsCustomEmoji => Id != null; public bool IsCustomEmoji => !Id.IsNullOrWhiteSpace();
public EmojiNode(string source, string id, string name, bool isAnimated) public EmojiNode(string source, string id, string name, bool isAnimated)
: base(source) : base(source)

2
DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj
View file

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" /> <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
DiscordChatExporter.Core.Models/Emoji.cs
View file

@ -40,7 +40,7 @@ namespace DiscordChatExporter.Core.Models
public static string GetImageUrl(string id, string name, bool isAnimated) public static string GetImageUrl(string id, string name, bool isAnimated)
{ {
// Custom emoji // Custom emoji
if (id != null) if (!id.IsNullOrWhiteSpace())
{ {
// Animated // Animated
if (isAnimated) if (isAnimated)

6
DiscordChatExporter.Core.Models/Guild.cs
View file

@ -1,4 +1,6 @@
namespace DiscordChatExporter.Core.Models using Tyrrrz.Extensions;
namespace DiscordChatExporter.Core.Models
{ {
// https://discordapp.com/developers/docs/resources/guild#guild-object // https://discordapp.com/developers/docs/resources/guild#guild-object
@ -28,7 +30,7 @@
{ {
public static string GetIconUrl(string id, string iconHash) public static string GetIconUrl(string id, string iconHash)
{ {
return iconHash != null return !iconHash.IsNullOrWhiteSpace()
? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png" ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
: "https://cdn.discordapp.com/embed/avatars/0.png"; : "https://cdn.discordapp.com/embed/avatars/0.png";
} }

3
DiscordChatExporter.Core.Models/User.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Core.Models namespace DiscordChatExporter.Core.Models
{ {
@ -39,7 +40,7 @@ namespace DiscordChatExporter.Core.Models
public static string GetAvatarUrl(string id, int discriminator, string avatarHash) public static string GetAvatarUrl(string id, int discriminator, string avatarHash)
{ {
// Custom avatar // Custom avatar
if (avatarHash != null) if (!avatarHash.IsNullOrWhiteSpace())
{ {
// Animated // Animated
if (avatarHash.StartsWith("a_", StringComparison.Ordinal)) if (avatarHash.StartsWith("a_", StringComparison.Ordinal))

2
DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.cs
View file

@ -92,7 +92,7 @@ namespace DiscordChatExporter.Core.Rendering
if (node is MultilineCodeBlockNode multilineCodeBlockNode) if (node is MultilineCodeBlockNode multilineCodeBlockNode)
{ {
// Set language class for syntax highlighting // Set language class for syntax highlighting
var languageCssClass = multilineCodeBlockNode.Language != null var languageCssClass = !multilineCodeBlockNode.Language.IsNullOrWhiteSpace()
? "language-" + multilineCodeBlockNode.Language ? "language-" + multilineCodeBlockNode.Language
: null; : null;

4
DiscordChatExporter.Core.Services/DataService.Parsers.cs
View file

@ -41,14 +41,14 @@ namespace DiscordChatExporter.Core.Services
var guildId = json["guild_id"]?.Value<string>(); var guildId = json["guild_id"]?.Value<string>();
// If the guild ID is blank, it's direct messages // If the guild ID is blank, it's direct messages
if (guildId == null) if (guildId.IsNullOrWhiteSpace())
guildId = Guild.DirectMessages.Id; guildId = Guild.DirectMessages.Id;
// Try to extract name // Try to extract name
var name = json["name"]?.Value<string>(); var name = json["name"]?.Value<string>();
// If the name is blank, it's direct messages // If the name is blank, it's direct messages
if (name == null) if (name.IsNullOrWhiteSpace())
name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", "); name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");
return new Channel(id, parentId, guildId, name, topic, type); return new Channel(id, parentId, guildId, name, topic, type);

2
DiscordChatExporter.Core.Services/DataService.cs
View file

@ -48,7 +48,7 @@ namespace DiscordChatExporter.Core.Services
var value = parameter.SubstringAfter("="); var value = parameter.SubstringAfter("=");
// Skip empty values // Skip empty values
if (value.IsEmpty()) if (value.IsNullOrWhiteSpace())
continue; continue;
request.RequestUri = request.RequestUri.SetQueryParameter(key, value); request.RequestUri = request.RequestUri.SetQueryParameter(key, value);

2
DiscordChatExporter.Core.Services/DiscordChatExporter.Core.Services.csproj
View file

@ -8,7 +8,7 @@
<PackageReference Include="Failsafe" Version="1.1.0" /> <PackageReference Include="Failsafe" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Onova" Version="2.4.2" /> <PackageReference Include="Onova" Version="2.4.2" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" /> <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
<PackageReference Include="Tyrrrz.Settings" Version="1.3.4" /> <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
</ItemGroup> </ItemGroup>

4
DiscordChatExporter.Core.Services/ExportService.cs
View file

@ -38,7 +38,7 @@ namespace DiscordChatExporter.Core.Services
{ {
// Create output directory // Create output directory
var dirPath = Path.GetDirectoryName(filePath); var dirPath = Path.GetDirectoryName(filePath);
if (!dirPath.EmptyIfNull().IsWhiteSpace()) if (!dirPath.IsNullOrWhiteSpace())
Directory.CreateDirectory(dirPath); Directory.CreateDirectory(dirPath);
// Render chat log to output file // Render chat log to output file
@ -74,7 +74,7 @@ namespace DiscordChatExporter.Core.Services
var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Length}]{fileExt}"; var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Length}]{fileExt}";
// Compose full file path // Compose full file path
if (!dirPath.EmptyIfNull().IsWhiteSpace()) if (!dirPath.IsNullOrWhiteSpace())
partitionFilePath = Path.Combine(dirPath, partitionFilePath); partitionFilePath = Path.Combine(dirPath, partitionFilePath);
// Export // Export

3
DiscordChatExporter.Core.Services/Helpers/ExportHelper.cs
View file

@ -3,6 +3,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using DiscordChatExporter.Core.Models; using DiscordChatExporter.Core.Models;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Core.Services.Helpers namespace DiscordChatExporter.Core.Services.Helpers
{ {
@ -11,7 +12,7 @@ namespace DiscordChatExporter.Core.Services.Helpers
public static bool IsDirectoryPath(string path) => public static bool IsDirectoryPath(string path) =>
path.Last() == Path.DirectorySeparatorChar || path.Last() == Path.DirectorySeparatorChar ||
path.Last() == Path.AltDirectorySeparatorChar || path.Last() == Path.AltDirectorySeparatorChar ||
Path.GetExtension(path) == null; (Path.GetExtension(path).IsNullOrWhiteSpace() && !File.Exists(path));
public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel, public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel,
DateTimeOffset? after = null, DateTimeOffset? before = null) DateTimeOffset? after = null, DateTimeOffset? before = null)

2
DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
View file

@ -148,7 +148,7 @@
<Version>2.0.20525</Version> <Version>2.0.20525</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Tyrrrz.Extensions"> <PackageReference Include="Tyrrrz.Extensions">
<Version>1.6.0</Version> <Version>1.6.1</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

3
DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
View file

@ -6,6 +6,7 @@ using DiscordChatExporter.Core.Services;
using DiscordChatExporter.Core.Services.Helpers; using DiscordChatExporter.Core.Services.Helpers;
using DiscordChatExporter.Gui.ViewModels.Components; using DiscordChatExporter.Gui.ViewModels.Components;
using DiscordChatExporter.Gui.ViewModels.Framework; using DiscordChatExporter.Gui.ViewModels.Framework;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Gui.ViewModels.Dialogs namespace DiscordChatExporter.Gui.ViewModels.Dialogs
{ {
@ -84,7 +85,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
} }
// If canceled - return // If canceled - return
if (OutputPath == null) if (OutputPath.IsNullOrWhiteSpace())
return; return;
// Close dialog // Close dialog

4
DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
View file

@ -122,7 +122,7 @@ namespace DiscordChatExporter.Gui.ViewModels
await _dialogManager.ShowDialogAsync(dialog); await _dialogManager.ShowDialogAsync(dialog);
} }
public bool CanPopulateGuildsAndChannels => !IsBusy && !TokenValue.EmptyIfNull().IsWhiteSpace(); public bool CanPopulateGuildsAndChannels => !IsBusy && !TokenValue.IsNullOrWhiteSpace();
public async void PopulateGuildsAndChannels() public async void PopulateGuildsAndChannels()
{ {
@ -235,7 +235,7 @@ namespace DiscordChatExporter.Gui.ViewModels
} }
} }
public bool CanExportChannels => !IsBusy && SelectedChannels.EmptyIfNull().Any(); public bool CanExportChannels => !IsBusy && !SelectedChannels.IsNullOrEmpty();
public async void ExportChannels() public async void ExportChannels()
{ {