Compare commits
14 Commits
fa10b5c7d0
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 75b6b1dc4d | |||
| 1161a437c4 | |||
| 605ba95848 | |||
| eb38bafd23 | |||
| e2d5ae2a70 | |||
| b3ab21ae38 | |||
| 67d007bb31 | |||
| bf28ba1914 | |||
| 40630dee35 | |||
| c6baa6a187 | |||
| 557052bbc7 | |||
| 696d0f8fcb | |||
| 201b19cbb5 | |||
| d7d4b3b31b |
+23
-13
@@ -12,8 +12,8 @@ public class Settings
|
|||||||
public Customers customers = new();
|
public Customers customers = new();
|
||||||
public PdfExportSettings pdfExport { get; set; } = new();
|
public PdfExportSettings pdfExport { get; set; } = new();
|
||||||
|
|
||||||
public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
// public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient", "config.json");
|
// "logofclient", "config.json");
|
||||||
|
|
||||||
public Settings()
|
public Settings()
|
||||||
{
|
{
|
||||||
@@ -23,23 +23,21 @@ public class Settings
|
|||||||
|
|
||||||
public static void Save()
|
public static void Save()
|
||||||
{
|
{
|
||||||
if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
if (!Directory.Exists(Global._instance.config_path))
|
||||||
"logofclient")))
|
Directory.CreateDirectory(Global._instance.config_path);
|
||||||
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
// if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||||
"logofclient"));
|
|
||||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
|
||||||
|
|
||||||
var json = JsonConvert.SerializeObject(_instance);
|
var json = JsonConvert.SerializeObject(_instance);
|
||||||
File.WriteAllText(_instance.settingsPath, json);
|
File.WriteAllText(Path.Combine(Global._instance.config_path,"config.json"), json);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Load()
|
public static void Load()
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
//if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var contents = File.ReadAllText(_instance.settingsPath);
|
var contents = File.ReadAllText(Path.Combine(Global._instance.config_path, "config.json"));
|
||||||
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
||||||
MainWindow._instance.RefreshCustomerItems();
|
MainWindow._instance.RefreshCustomerItems();
|
||||||
}
|
}
|
||||||
@@ -82,9 +80,13 @@ public class Global
|
|||||||
|
|
||||||
public string config_path { get; set; } = Path.Combine(
|
public string config_path { get; set; } = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient",
|
"logofclient");
|
||||||
"config.json");
|
|
||||||
|
|
||||||
|
public void SetConfigPath(string path)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(path))
|
||||||
|
config_path = PathUtilities.NormalizeFileSystemPath(path);
|
||||||
|
}
|
||||||
public string wiki_storage_path { get; set; } = Path.Combine(
|
public string wiki_storage_path { get; set; } = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient",
|
"logofclient",
|
||||||
@@ -118,7 +120,8 @@ public class Global
|
|||||||
var contents = File.ReadAllText(Path.Combine(
|
var contents = File.ReadAllText(Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||||
"global.config"));
|
"global.config"));
|
||||||
_instance = JsonConvert.DeserializeObject<Global>(contents);
|
_instance = JsonConvert.DeserializeObject<Global>(contents) ?? new Global();
|
||||||
|
_instance.NormalizePaths();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -127,6 +130,13 @@ public class Global
|
|||||||
Save();
|
Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void NormalizePaths()
|
||||||
|
{
|
||||||
|
config_path = PathUtilities.NormalizeFileSystemPath(config_path);
|
||||||
|
wiki_storage_path = PathUtilities.NormalizeFileSystemPath(wiki_storage_path);
|
||||||
|
font_path = PathUtilities.NormalizeFileSystemPath(font_path);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Customers
|
public class Customers
|
||||||
|
|||||||
+2
-2
@@ -78,7 +78,7 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</MenuItem.Header>
|
</MenuItem.Header>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
|
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
|
||||||
<MenuItem.Header>
|
<MenuItem.Header>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
||||||
@@ -389,7 +389,7 @@
|
|||||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||||
Watermark="/home/username/.config/logofclient/config.json" />
|
Watermark="/home/username/.config/logofclient/" />
|
||||||
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||||
<Button.Content>
|
<Button.Content>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
|
|||||||
+80
-20
@@ -38,6 +38,11 @@ public partial class MainWindow : Window
|
|||||||
Logger.Log("Loading settings...");
|
Logger.Log("Loading settings...");
|
||||||
Global.Load();
|
Global.Load();
|
||||||
Settings.Load();
|
Settings.Load();
|
||||||
|
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(Global._instance.config_path))
|
||||||
|
TbConfigPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.config_path);
|
||||||
|
|
||||||
LoadPdfExportOptions();
|
LoadPdfExportOptions();
|
||||||
HookPdfExportOptionEvents();
|
HookPdfExportOptionEvents();
|
||||||
|
|
||||||
@@ -57,7 +62,7 @@ public partial class MainWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||||
TbWikiPath.Text = Global._instance.wiki_storage_path;
|
TbWikiPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -132,6 +137,8 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
Settings.Save();
|
||||||
|
Global.Save();
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,6 +219,11 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
|
|
||||||
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
ReloadWikiItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void ReloadWikiItem()
|
||||||
{
|
{
|
||||||
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
||||||
{
|
{
|
||||||
@@ -255,6 +267,8 @@ public partial class MainWindow : Window
|
|||||||
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
||||||
selectedNode != null)
|
selectedNode != null)
|
||||||
NavTree.SelectedItem = selectedNode;
|
NavTree.SelectedItem = selectedNode;
|
||||||
|
|
||||||
|
ReloadWikiItem();
|
||||||
}catch (Exception ex)
|
}catch (Exception ex)
|
||||||
{
|
{
|
||||||
Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
|
Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
|
||||||
@@ -275,7 +289,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var wikiRoot = Global._instance.wiki_storage_path;
|
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
|
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
|
||||||
{
|
{
|
||||||
if (selectedItem.IsFolder) return selectedItem.Path;
|
if (selectedItem.IsFolder) return selectedItem.Path;
|
||||||
@@ -294,6 +308,9 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private static bool PathsEqual(string left, string right)
|
private static bool PathsEqual(string left, string right)
|
||||||
{
|
{
|
||||||
|
left = PathUtilities.NormalizeFileSystemPath(left);
|
||||||
|
right = PathUtilities.NormalizeFileSystemPath(right);
|
||||||
|
|
||||||
var normalizedLeft = Path.GetFullPath(left)
|
var normalizedLeft = Path.GetFullPath(left)
|
||||||
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
||||||
var normalizedRight = Path.GetFullPath(right)
|
var normalizedRight = Path.GetFullPath(right)
|
||||||
@@ -337,7 +354,7 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var path = Global._instance.wiki_storage_path;
|
var path = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
if (!Directory.Exists(path)) return;
|
if (!Directory.Exists(path)) return;
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -364,9 +381,9 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder == null || folder.Count == 0) return;
|
if (folder == null || folder.Count == 0) return;
|
||||||
var chosen = folder[0].Path;
|
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||||
TbWikiPath.Text = chosen.ToString();
|
TbWikiPath.Text = chosen;
|
||||||
Global._instance.wiki_storage_path = chosen.ToString();
|
Global._instance.wiki_storage_path = chosen;
|
||||||
Global.Save();
|
Global.Save();
|
||||||
|
|
||||||
// reinit wiki service and reload tree
|
// reinit wiki service and reload tree
|
||||||
@@ -384,9 +401,9 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder == null || folder.Count == 0) return;
|
if (folder == null || folder.Count == 0) return;
|
||||||
var chosen = folder[0].Path;
|
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||||
TbFontPath.Text = chosen.ToString();
|
TbFontPath.Text = chosen;
|
||||||
Global._instance.font_path = chosen.ToString();
|
Global._instance.font_path = chosen;
|
||||||
Global.Save();
|
Global.Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -400,9 +417,9 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder == null || folder.Count == 0) return;
|
if (folder == null || folder.Count == 0) return;
|
||||||
var chosen = folder[0].Path;
|
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||||
TbConfigPath.Text = chosen.ToString();
|
Global._instance.SetConfigPath(chosen);
|
||||||
Global._instance.config_path = chosen.ToString();
|
TbConfigPath.Text = Global._instance.config_path;
|
||||||
Global.Save();
|
Global.Save();
|
||||||
|
|
||||||
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
||||||
@@ -441,6 +458,7 @@ public partial class MainWindow : Window
|
|||||||
TbSettingsCustomerDescription.Text = "";
|
TbSettingsCustomerDescription.Text = "";
|
||||||
TbSettingsCustomerName.Text = "";
|
TbSettingsCustomerName.Text = "";
|
||||||
TbSettingsCustomerPatchInfo.Text = "";
|
TbSettingsCustomerPatchInfo.Text = "";
|
||||||
|
TbSettingsCustomerName.Focus();
|
||||||
|
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
RefreshCustomerItems();
|
RefreshCustomerItems();
|
||||||
@@ -491,7 +509,13 @@ public partial class MainWindow : Window
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var editedWikiFilePath = _selectedWikiFilePath;
|
||||||
EditorWindow ew = new(_selectedWikiFilePath);
|
EditorWindow ew = new(_selectedWikiFilePath);
|
||||||
|
ew.Closed += (_, _) =>
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(editedWikiFilePath) && File.Exists(editedWikiFilePath))
|
||||||
|
PopulateNavTree(editedWikiFilePath, editedWikiFilePath);
|
||||||
|
};
|
||||||
ew.Show();
|
ew.Show();
|
||||||
|
|
||||||
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
||||||
@@ -829,10 +853,7 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(filePath))
|
if (!string.IsNullOrWhiteSpace(filePath))
|
||||||
{
|
{
|
||||||
if (filePath.StartsWith("file://"))
|
filePath = PathUtilities.NormalizeFileSystemPath(filePath);
|
||||||
{
|
|
||||||
filePath = new Uri(filePath).LocalPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
Console.WriteLine($"PATH: {filePath}");
|
Console.WriteLine($"PATH: {filePath}");
|
||||||
|
|
||||||
@@ -1106,11 +1127,18 @@ public partial class MainWindow : Window
|
|||||||
result = result.Trim();
|
result = result.Trim();
|
||||||
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
||||||
|
|
||||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
if (!Directory.Exists(wikiRoot))
|
||||||
|
Directory.CreateDirectory(wikiRoot);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (PathUtilities.HasInvalidFileNameChars(result))
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, "Der Dateiname enthält ungültige Zeichen.", "Fehler");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||||
Directory.CreateDirectory(targetDirectory);
|
Directory.CreateDirectory(targetDirectory);
|
||||||
var newFilePath = Path.Combine(targetDirectory, result);
|
var newFilePath = Path.Combine(targetDirectory, result);
|
||||||
@@ -1131,11 +1159,18 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
result = result.Trim();
|
result = result.Trim();
|
||||||
|
|
||||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
if (!Directory.Exists(wikiRoot))
|
||||||
|
Directory.CreateDirectory(wikiRoot);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (PathUtilities.HasInvalidFileNameChars(result))
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, "Der Ordnername enthält ungültige Zeichen.", "Fehler");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||||
var newFolderPath = Path.Combine(targetDirectory, result);
|
var newFolderPath = Path.Combine(targetDirectory, result);
|
||||||
Directory.CreateDirectory(newFolderPath);
|
Directory.CreateDirectory(newFolderPath);
|
||||||
@@ -1223,4 +1258,29 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void MnIAdSetDelete_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if(await MessageBox.Show(this,"Wirklich löschen?","",MessageBoxButton.YesNo) == MessageBoxResult.Yes)
|
||||||
|
{
|
||||||
|
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
||||||
|
var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
if (set.ID == id)
|
||||||
|
{
|
||||||
|
Settings._instance.addressSets.addresses.Remove(set);
|
||||||
|
Settings.Save();
|
||||||
|
RefreshAddressSetListItems(cus_id);
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while deleting address set: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen"
|
||||||
x:Class="Logof_Client.MessageBox" Icon="assets/icon.ico"
|
x:Class="Logof_Client.MessageBox" Icon="assets/icon.ico"
|
||||||
Title="MessageBox">
|
Title="MessageBox">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
|
|||||||
+16
-5
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -65,11 +66,21 @@ public class CsvBuilder
|
|||||||
|
|
||||||
private string EscapeCsvField(string? value)
|
private string EscapeCsvField(string? value)
|
||||||
{
|
{
|
||||||
var field = value ?? string.Empty;
|
try
|
||||||
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
{
|
||||||
if (!mustQuote)
|
var field = value ?? string.Empty;
|
||||||
return field;
|
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
||||||
|
if (!mustQuote)
|
||||||
|
return field;
|
||||||
|
|
||||||
|
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while escapting csv field: {ex.Message}",Logger.LogType.Warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
|
||||||
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+237
-210
@@ -20,210 +20,227 @@ public class DataImport
|
|||||||
|
|
||||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||||
{
|
{
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
try
|
||||||
{
|
{
|
||||||
Console.WriteLine($"File not found: {pathToCsv}");
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
using var reader = new StreamReader(pathToCsv.LocalPath);
|
|
||||||
var headerLine = reader.ReadLine();
|
|
||||||
if (headerLine == null)
|
|
||||||
{
|
|
||||||
Console.WriteLine("File is empty.");
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
var imported = new KasAddressList(
|
|
||||||
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
|
||||||
|
|
||||||
while (!reader.EndOfStream)
|
|
||||||
{
|
|
||||||
var line = reader.ReadLine();
|
|
||||||
if (string.IsNullOrWhiteSpace(line))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var parts = ParseCsvLine(line, separator);
|
|
||||||
|
|
||||||
if (parts.Length < 24)
|
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Not enough columns in line: {line}");
|
Console.WriteLine($"File not found: {pathToCsv}");
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count),
|
|
||||||
ParseInt(parts[0]),
|
|
||||||
parts[1],
|
|
||||||
parts[2],
|
|
||||||
parts[3],
|
|
||||||
parts[4],
|
|
||||||
parts[5],
|
|
||||||
parts[6],
|
|
||||||
parts[7],
|
|
||||||
parts[8],
|
|
||||||
parts[9],
|
|
||||||
parts[10],
|
|
||||||
parts[11],
|
|
||||||
parts[12],
|
|
||||||
parts[13],
|
|
||||||
parts[14],
|
|
||||||
parts[15],
|
|
||||||
parts[16],
|
|
||||||
parts[17],
|
|
||||||
parts[18],
|
|
||||||
parts[19],
|
|
||||||
parts[20],
|
|
||||||
parts[21],
|
|
||||||
parts[22],
|
|
||||||
parts[23]
|
|
||||||
);
|
|
||||||
imported.KasPersons.Add(person);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
return (false, null);
|
return (false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
using var reader = new StreamReader(pathToCsv.LocalPath);
|
||||||
|
var headerLine = reader.ReadLine();
|
||||||
|
if (headerLine == null)
|
||||||
|
{
|
||||||
|
Console.WriteLine("File is empty.");
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var imported = new KasAddressList(
|
||||||
|
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||||
|
|
||||||
|
while (!reader.EndOfStream)
|
||||||
|
{
|
||||||
|
var line = reader.ReadLine();
|
||||||
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var parts = ParseCsvLine(line, separator);
|
||||||
|
|
||||||
|
if (parts.Length < 24)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Not enough columns in line: {line}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count),
|
||||||
|
ParseInt(parts[0]),
|
||||||
|
parts[1],
|
||||||
|
parts[2],
|
||||||
|
parts[3],
|
||||||
|
parts[4],
|
||||||
|
parts[5],
|
||||||
|
parts[6],
|
||||||
|
parts[7],
|
||||||
|
parts[8],
|
||||||
|
parts[9],
|
||||||
|
parts[10],
|
||||||
|
parts[11],
|
||||||
|
parts[12],
|
||||||
|
parts[13],
|
||||||
|
parts[14],
|
||||||
|
parts[15],
|
||||||
|
parts[16],
|
||||||
|
parts[17],
|
||||||
|
parts[18],
|
||||||
|
parts[19],
|
||||||
|
parts[20],
|
||||||
|
parts[21],
|
||||||
|
parts[22],
|
||||||
|
parts[23]
|
||||||
|
);
|
||||||
|
imported.KasPersons.Add(person);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating new kas person (import): {ex.Message}",Logger.LogType.Error);
|
||||||
|
Console.WriteLine(ex.StackTrace);
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (true, imported);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing kas address list without patch: {ex.Message}",Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (true, imported);
|
return (false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||||
char separator)
|
char separator)
|
||||||
{
|
{
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
try
|
||||||
{
|
{
|
||||||
Console.WriteLine($"File not found: {pathToCsv}");
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
using var reader = new StreamReader(pathToCsv.LocalPath);
|
|
||||||
var headerLine = reader.ReadLine();
|
|
||||||
if (headerLine == null)
|
|
||||||
{
|
|
||||||
Console.WriteLine("File is empty.");
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
var headers = ParseCsvLine(headerLine, separator);
|
|
||||||
|
|
||||||
var imported = new KasAddressList(
|
|
||||||
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
|
||||||
var patchType = typeof(AddressPatch);
|
|
||||||
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
|
||||||
|
|
||||||
var hasProperties = patchType.GetProperties(binding)
|
|
||||||
.Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
|
|
||||||
.ToArray();
|
|
||||||
|
|
||||||
//var last_refsid = 1000000;
|
|
||||||
|
|
||||||
while (!reader.EndOfStream)
|
|
||||||
{
|
|
||||||
var line = reader.ReadLine();
|
|
||||||
if (string.IsNullOrWhiteSpace(line))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var parts = ParseCsvLine(line, separator);
|
|
||||||
|
|
||||||
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
|
||||||
|
|
||||||
//var refsid_existing = false;
|
|
||||||
|
|
||||||
foreach (var hasProp in hasProperties)
|
|
||||||
{
|
{
|
||||||
var fieldName = hasProp.Name.Substring(4);
|
Console.WriteLine($"File not found: {pathToCsv}");
|
||||||
|
|
||||||
|
|
||||||
var hasObj = hasProp.GetValue(patch);
|
|
||||||
var has = hasObj is bool b && b;
|
|
||||||
|
|
||||||
var patchProp = patchType.GetProperty(fieldName + "_is", binding);
|
|
||||||
|
|
||||||
string desiredHeader = null;
|
|
||||||
if (has && patchProp != null)
|
|
||||||
desiredHeader = patchProp.GetValue(patch)?.ToString();
|
|
||||||
else
|
|
||||||
desiredHeader = fieldName;
|
|
||||||
|
|
||||||
var resolvedValue = "";
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(desiredHeader))
|
|
||||||
{
|
|
||||||
var idx = Array.FindIndex(headers,
|
|
||||||
h => string.Equals(h, desiredHeader, StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (idx >= 0 && idx < parts.Length)
|
|
||||||
{
|
|
||||||
resolvedValue = parts[idx];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var altIdx = Array.FindIndex(headers, h =>
|
|
||||||
string.Equals(h, fieldName, StringComparison.OrdinalIgnoreCase) ||
|
|
||||||
string.Equals(h, fieldName + "_is", StringComparison.OrdinalIgnoreCase));
|
|
||||||
|
|
||||||
if (altIdx >= 0 && altIdx < parts.Length)
|
|
||||||
resolvedValue = parts[altIdx];
|
|
||||||
else
|
|
||||||
resolvedValue = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fieldValues[fieldName] = resolvedValue ?? "";
|
|
||||||
}
|
|
||||||
|
|
||||||
string GetField(string name)
|
|
||||||
{
|
|
||||||
return fieldValues.TryGetValue(name, out var v) ? v : "";
|
|
||||||
}
|
|
||||||
|
|
||||||
var refsid = 0;
|
|
||||||
if (patch.has_refsid)
|
|
||||||
refsid = ParseInt(GetField("refsid"));
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count), refsid,
|
|
||||||
GetField("anrede"),
|
|
||||||
GetField("titel"),
|
|
||||||
GetField("vorname"),
|
|
||||||
GetField("adel"),
|
|
||||||
GetField("name"),
|
|
||||||
GetField("namezus"),
|
|
||||||
GetField("anredzus"),
|
|
||||||
GetField("strasse"),
|
|
||||||
GetField("strasse2"),
|
|
||||||
GetField("plz"),
|
|
||||||
GetField("ort"),
|
|
||||||
GetField("land"),
|
|
||||||
GetField("pplz"),
|
|
||||||
GetField("postfach"),
|
|
||||||
GetField("name1"),
|
|
||||||
GetField("name2"),
|
|
||||||
GetField("name3"),
|
|
||||||
GetField("name4"),
|
|
||||||
GetField("name5"),
|
|
||||||
GetField("funktion"),
|
|
||||||
GetField("funktion2"),
|
|
||||||
GetField("abteilung"),
|
|
||||||
GetField("funktionad")
|
|
||||||
);
|
|
||||||
|
|
||||||
imported.KasPersons.Add(person);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
return (false, null);
|
return (false, null);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return (true, imported);
|
using var reader = new StreamReader(pathToCsv.LocalPath);
|
||||||
|
var headerLine = reader.ReadLine();
|
||||||
|
if (headerLine == null)
|
||||||
|
{
|
||||||
|
Console.WriteLine("File is empty.");
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var headers = ParseCsvLine(headerLine, separator);
|
||||||
|
|
||||||
|
var imported = new KasAddressList(
|
||||||
|
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||||
|
var patchType = typeof(AddressPatch);
|
||||||
|
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
||||||
|
|
||||||
|
var hasProperties = patchType.GetProperties(binding)
|
||||||
|
.Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
//var last_refsid = 1000000;
|
||||||
|
|
||||||
|
while (!reader.EndOfStream)
|
||||||
|
{
|
||||||
|
var line = reader.ReadLine();
|
||||||
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var parts = ParseCsvLine(line, separator);
|
||||||
|
|
||||||
|
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
//var refsid_existing = false;
|
||||||
|
|
||||||
|
foreach (var hasProp in hasProperties)
|
||||||
|
{
|
||||||
|
var fieldName = hasProp.Name.Substring(4);
|
||||||
|
|
||||||
|
|
||||||
|
var hasObj = hasProp.GetValue(patch);
|
||||||
|
var has = hasObj is bool b && b;
|
||||||
|
|
||||||
|
var patchProp = patchType.GetProperty(fieldName + "_is", binding);
|
||||||
|
|
||||||
|
string desiredHeader = null;
|
||||||
|
if (has && patchProp != null)
|
||||||
|
desiredHeader = patchProp.GetValue(patch)?.ToString();
|
||||||
|
else
|
||||||
|
desiredHeader = fieldName;
|
||||||
|
|
||||||
|
var resolvedValue = "";
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(desiredHeader))
|
||||||
|
{
|
||||||
|
var idx = Array.FindIndex(headers,
|
||||||
|
h => string.Equals(h, desiredHeader, StringComparison.OrdinalIgnoreCase));
|
||||||
|
if (idx >= 0 && idx < parts.Length)
|
||||||
|
{
|
||||||
|
resolvedValue = parts[idx];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var altIdx = Array.FindIndex(headers, h =>
|
||||||
|
string.Equals(h, fieldName, StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
string.Equals(h, fieldName + "_is", StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
|
if (altIdx >= 0 && altIdx < parts.Length)
|
||||||
|
resolvedValue = parts[altIdx];
|
||||||
|
else
|
||||||
|
resolvedValue = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fieldValues[fieldName] = resolvedValue ?? "";
|
||||||
|
}
|
||||||
|
|
||||||
|
string GetField(string name)
|
||||||
|
{
|
||||||
|
return fieldValues.TryGetValue(name, out var v) ? v : "";
|
||||||
|
}
|
||||||
|
|
||||||
|
var refsid = 0;
|
||||||
|
if (patch.has_refsid)
|
||||||
|
refsid = ParseInt(GetField("refsid"));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count), refsid,
|
||||||
|
GetField("anrede"),
|
||||||
|
GetField("titel"),
|
||||||
|
GetField("vorname"),
|
||||||
|
GetField("adel"),
|
||||||
|
GetField("name"),
|
||||||
|
GetField("namezus"),
|
||||||
|
GetField("anredzus"),
|
||||||
|
GetField("strasse"),
|
||||||
|
GetField("strasse2"),
|
||||||
|
GetField("plz"),
|
||||||
|
GetField("ort"),
|
||||||
|
GetField("land"),
|
||||||
|
GetField("pplz"),
|
||||||
|
GetField("postfach"),
|
||||||
|
GetField("name1"),
|
||||||
|
GetField("name2"),
|
||||||
|
GetField("name3"),
|
||||||
|
GetField("name4"),
|
||||||
|
GetField("name5"),
|
||||||
|
GetField("funktion"),
|
||||||
|
GetField("funktion2"),
|
||||||
|
GetField("abteilung"),
|
||||||
|
GetField("funktionad")
|
||||||
|
);
|
||||||
|
|
||||||
|
imported.KasPersons.Add(person);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating kas person (import, patch): {ex.Message}",Logger.LogType.Error);
|
||||||
|
Console.WriteLine(ex.StackTrace);
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (true, imported);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing kas address list with patch: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// int GenerateNewRefsid()
|
// int GenerateNewRefsid()
|
||||||
// {
|
// {
|
||||||
@@ -236,6 +253,7 @@ public class DataImport
|
|||||||
// last_refsid = biggest + 1;
|
// last_refsid = biggest + 1;
|
||||||
// return last_refsid;
|
// return last_refsid;
|
||||||
// }
|
// }
|
||||||
|
return (false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -246,38 +264,47 @@ public class DataImport
|
|||||||
|
|
||||||
private static string[] ParseCsvLine(string line, char separator)
|
private static string[] ParseCsvLine(string line, char separator)
|
||||||
{
|
{
|
||||||
var fields = new List<string>();
|
try
|
||||||
var current = new StringBuilder();
|
|
||||||
var inQuotes = false;
|
|
||||||
|
|
||||||
for (var i = 0; i < line.Length; i++)
|
|
||||||
{
|
{
|
||||||
var c = line[i];
|
var fields = new List<string>();
|
||||||
|
var current = new StringBuilder();
|
||||||
|
var inQuotes = false;
|
||||||
|
|
||||||
if (c == '"')
|
for (var i = 0; i < line.Length; i++)
|
||||||
{
|
{
|
||||||
if (inQuotes && i + 1 < line.Length && line[i + 1] == '"')
|
var c = line[i];
|
||||||
|
|
||||||
|
if (c == '"')
|
||||||
{
|
{
|
||||||
current.Append('"');
|
if (inQuotes && i + 1 < line.Length && line[i + 1] == '"')
|
||||||
i++;
|
{
|
||||||
|
current.Append('"');
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
inQuotes = !inQuotes;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
inQuotes = !inQuotes;
|
if (c == separator && !inQuotes)
|
||||||
continue;
|
{
|
||||||
|
fields.Add(current.ToString().Trim());
|
||||||
|
current.Clear();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
current.Append(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c == separator && !inQuotes)
|
fields.Add(current.ToString().Trim());
|
||||||
{
|
return fields.ToArray();
|
||||||
fields.Add(current.ToString().Trim());
|
}
|
||||||
current.Clear();
|
catch (Exception ex)
|
||||||
continue;
|
{
|
||||||
}
|
Logger.Log($"Error while persing csv line: {ex.Message}",Logger.LogType.Error);
|
||||||
|
|
||||||
current.Append(c);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fields.Add(current.ToString().Trim());
|
return [];
|
||||||
return fields.ToArray();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+303
-210
@@ -18,45 +18,73 @@ public class PdfBuilder
|
|||||||
|
|
||||||
public PdfBuilder(PdfExportSettings? settings = null)
|
public PdfBuilder(PdfExportSettings? settings = null)
|
||||||
{
|
{
|
||||||
EnsureFontResolverRegistered();
|
|
||||||
_settings = settings ?? new PdfExportSettings();
|
|
||||||
|
|
||||||
// Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
|
|
||||||
var chosenFamily = "Arial";
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (Directory.Exists(Global._instance.font_path))
|
EnsureFontResolverRegistered();
|
||||||
{
|
_settings = settings ?? new PdfExportSettings();
|
||||||
var first = Directory.EnumerateFiles(Global._instance.font_path, "*.ttf").FirstOrDefault();
|
|
||||||
if (!string.IsNullOrEmpty(first))
|
// Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
|
||||||
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
var chosenFamily = "Arial";
|
||||||
}
|
try
|
||||||
}
|
{
|
||||||
catch
|
if (Directory.Exists(Global._instance.font_path))
|
||||||
{
|
{
|
||||||
chosenFamily = "Arial";
|
var first = Directory.EnumerateFiles(Global._instance.font_path, "*.ttf").FirstOrDefault();
|
||||||
}
|
if (!string.IsNullOrEmpty(first))
|
||||||
|
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while searching for fonts: {ex.Message}",Logger.LogType.Error);
|
||||||
|
chosenFamily = "Arial";
|
||||||
|
}
|
||||||
|
|
||||||
|
_boldFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Bold);
|
||||||
|
_regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
|
||||||
|
_smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while font resolving: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
_boldFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Bold);
|
|
||||||
_regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
|
|
||||||
_smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void EnsureFontResolverRegistered()
|
private static void EnsureFontResolverRegistered()
|
||||||
{
|
{
|
||||||
if (GlobalFontSettings.FontResolver != null) return;
|
try
|
||||||
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
{
|
||||||
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
if (GlobalFontSettings.FontResolver != null) return;
|
||||||
|
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
||||||
|
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while ensuring font resolver register state: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string StripStyleSuffix(string name)
|
private static string StripStyleSuffix(string name)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(name)) return name;
|
try
|
||||||
var idx = name.IndexOf('-');
|
{
|
||||||
if (idx < 0) idx = name.IndexOf('_');
|
if (string.IsNullOrEmpty(name)) return name;
|
||||||
if (idx > 0)
|
var idx = name.IndexOf('-');
|
||||||
return name.Substring(0, idx);
|
if (idx < 0) idx = name.IndexOf('_');
|
||||||
return name;
|
if (idx > 0)
|
||||||
|
return name.Substring(0, idx);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while stripping style suffix: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -69,42 +97,50 @@ public class PdfBuilder
|
|||||||
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
|
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
|
||||||
string outputPath)
|
string outputPath)
|
||||||
{
|
{
|
||||||
// Find the AddressSet by ID
|
|
||||||
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
|
|
||||||
if (addressSet == null)
|
|
||||||
throw new ArgumentException($"AddressSet with ID {addressSetId} not found");
|
|
||||||
|
|
||||||
if (addressSet.KasPersons == null || addressSet.KasPersons.Count == 0)
|
|
||||||
throw new ArgumentException($"AddressSet with ID {addressSetId} contains no addresses");
|
|
||||||
|
|
||||||
// Generate markdown addresses from all KasPersons in the set
|
|
||||||
//var addresses = new string?[addressSet.KasPersons.Count];
|
|
||||||
var addresses = new List<string>();
|
|
||||||
|
|
||||||
// find customer (owner) to include sender_address
|
|
||||||
string senderLine = null;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var owner = Settings._instance.customers.customers.FirstOrDefault(c => c.ID == addressSet.owner_id);
|
// Find the AddressSet by ID
|
||||||
if (owner != null && !string.IsNullOrWhiteSpace(owner.sender_address))
|
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
|
||||||
senderLine = "<font6>" + owner.sender_address.Replace("\n", " ").Trim() + "</font6>\n";
|
if (addressSet == null)
|
||||||
}
|
throw new ArgumentException($"AddressSet with ID {addressSetId} not found");
|
||||||
catch
|
|
||||||
{
|
|
||||||
senderLine = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < addressSet.KasPersons.Count; i++)
|
if (addressSet.KasPersons == null || addressSet.KasPersons.Count == 0)
|
||||||
{
|
throw new ArgumentException($"AddressSet with ID {addressSetId} contains no addresses");
|
||||||
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
|
|
||||||
if (string.IsNullOrWhiteSpace(addr)) continue;
|
|
||||||
if (!string.IsNullOrEmpty(senderLine))
|
|
||||||
addresses.Add(senderLine + (addr ?? ""));
|
|
||||||
else
|
|
||||||
addresses.Add(addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
// Generate markdown addresses from all KasPersons in the set
|
||||||
|
//var addresses = new string?[addressSet.KasPersons.Count];
|
||||||
|
var addresses = new List<string>();
|
||||||
|
|
||||||
|
// find customer (owner) to include sender_address
|
||||||
|
string senderLine = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var owner = Settings._instance.customers.customers.FirstOrDefault(c => c.ID == addressSet.owner_id);
|
||||||
|
if (owner != null && !string.IsNullOrWhiteSpace(owner.sender_address))
|
||||||
|
senderLine = "<font6>" + owner.sender_address.Replace("\n", " ").Trim() + "</font6>\n";
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
senderLine = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < addressSet.KasPersons.Count; i++)
|
||||||
|
{
|
||||||
|
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
|
||||||
|
if (string.IsNullOrWhiteSpace(addr)) continue;
|
||||||
|
if (!string.IsNullOrEmpty(senderLine))
|
||||||
|
addresses.Add(senderLine + (addr ?? ""));
|
||||||
|
else
|
||||||
|
addresses.Add(addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating address label pdf from address set with placeholder: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -115,26 +151,34 @@ public class PdfBuilder
|
|||||||
/// <param name="outputPath">Path where the PDF should be saved</param>
|
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||||
public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
|
public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
|
||||||
{
|
{
|
||||||
if (addresses == null || addresses.Count == 0)
|
try
|
||||||
throw new ArgumentException("Addresses array cannot be null or empty");
|
|
||||||
|
|
||||||
var document = new PdfDocument();
|
|
||||||
|
|
||||||
var addressIndex = 0;
|
|
||||||
var isFirstCell = true;
|
|
||||||
|
|
||||||
while (addressIndex < addresses.Count || isFirstCell)
|
|
||||||
{
|
{
|
||||||
var page = document.AddPage();
|
if (addresses == null || addresses.Count == 0)
|
||||||
page.Size = PageSize.A4;
|
throw new ArgumentException("Addresses array cannot be null or empty");
|
||||||
|
|
||||||
using (var gfx = XGraphics.FromPdfPage(page))
|
var document = new PdfDocument();
|
||||||
{
|
|
||||||
DrawPageWithPlaceholder(gfx, addresses, ref addressIndex, ref isFirstCell, placeholderText);
|
var addressIndex = 0;
|
||||||
}
|
var isFirstCell = true;
|
||||||
|
|
||||||
|
while (addressIndex < addresses.Count || isFirstCell)
|
||||||
|
{
|
||||||
|
var page = document.AddPage();
|
||||||
|
page.Size = PageSize.A4;
|
||||||
|
|
||||||
|
using (var gfx = XGraphics.FromPdfPage(page))
|
||||||
|
{
|
||||||
|
DrawPageWithPlaceholder(gfx, addresses, ref addressIndex, ref isFirstCell, placeholderText);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.Save(outputPath);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
document.Save(outputPath);
|
{
|
||||||
|
Logger.Log($"Error while creating address label pdf with placeholder: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
|
private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
|
||||||
@@ -159,193 +203,242 @@ public class PdfBuilder
|
|||||||
private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
|
private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
|
||||||
ref bool isFirstCell, string placeholderText)
|
ref bool isFirstCell, string placeholderText)
|
||||||
{
|
{
|
||||||
for (var row = 0; row < _settings.rowsPerPage; row++)
|
try
|
||||||
for (var col = 0; col < _settings.columnsPerPage; col++)
|
|
||||||
{
|
{
|
||||||
var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
|
for (var row = 0; row < _settings.rowsPerPage; row++)
|
||||||
var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
|
for (var col = 0; col < _settings.columnsPerPage; col++)
|
||||||
|
{
|
||||||
|
var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
|
||||||
|
var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
|
||||||
|
|
||||||
// First cell: placeholder
|
// First cell: placeholder
|
||||||
if (isFirstCell)
|
if (isFirstCell)
|
||||||
{
|
{
|
||||||
DrawCell(gfx, x, y, placeholderText);
|
DrawCell(gfx, x, y, placeholderText);
|
||||||
isFirstCell = false;
|
isFirstCell = false;
|
||||||
}
|
}
|
||||||
else if (addressIndex < addresses.Count)
|
else if (addressIndex < addresses.Count)
|
||||||
{
|
{
|
||||||
DrawCell(gfx, x, y, addresses[addressIndex]);
|
DrawCell(gfx, x, y, addresses[addressIndex]);
|
||||||
addressIndex++;
|
addressIndex++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DrawEmptyCell(gfx, x, y);
|
DrawEmptyCell(gfx, x, y);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing page with placholder: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DrawCell(XGraphics gfx, double x, double y, string? address)
|
private void DrawCell(XGraphics gfx, double x, double y, string? address)
|
||||||
{
|
{
|
||||||
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
try
|
||||||
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
{
|
||||||
|
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||||
|
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||||
|
|
||||||
// Draw cell border
|
// Draw cell border
|
||||||
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
||||||
gfx.DrawRectangle(XPens.Black, rect);
|
gfx.DrawRectangle(XPens.Black, rect);
|
||||||
|
|
||||||
// Draw address content if available
|
// Draw address content if available
|
||||||
if (!string.IsNullOrEmpty(address)) DrawMarkdownText(gfx, address, x, y, cellWidthPoints, cellHeightPoints);
|
if (!string.IsNullOrEmpty(address)) DrawMarkdownText(gfx, address, x, y, cellWidthPoints, cellHeightPoints);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing cell: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DrawEmptyCell(XGraphics gfx, double x, double y)
|
private void DrawEmptyCell(XGraphics gfx, double x, double y)
|
||||||
{
|
{
|
||||||
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
try
|
||||||
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
{
|
||||||
|
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||||
|
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||||
|
|
||||||
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
||||||
gfx.DrawRectangle(XPens.Black, rect);
|
gfx.DrawRectangle(XPens.Black, rect);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing empty cell: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
|
private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
|
||||||
{
|
{
|
||||||
var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
|
try
|
||||||
var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
|
|
||||||
var paddingTopPoints = MmToPoints(_settings.cellPaddingTopMm);
|
|
||||||
var paddingBottomPoints = MmToPoints(_settings.cellPaddingBottomMm);
|
|
||||||
|
|
||||||
var maxWidth = Math.Max(0, cellWidth - paddingLeftPoints - paddingRightPoints);
|
|
||||||
|
|
||||||
// Split text by newlines and remove empty trailing lines
|
|
||||||
var rawLines = text.Split(new[] { "\n" }, StringSplitOptions.None);
|
|
||||||
var lines = rawLines.Where(l => l != null).ToArray();
|
|
||||||
|
|
||||||
// Use a conservative line height in points
|
|
||||||
var lineHeight = _regularFont.Size * 1.2;
|
|
||||||
|
|
||||||
// Calculate total height of the text block
|
|
||||||
var totalHeight = lines.Length * lineHeight;
|
|
||||||
|
|
||||||
// Start drawing from the top of the cell (align addresses to top)
|
|
||||||
var startY = y + paddingTopPoints;
|
|
||||||
|
|
||||||
var currentY = startY;
|
|
||||||
|
|
||||||
foreach (var line in lines)
|
|
||||||
{
|
{
|
||||||
// Stop if we've reached the top boundary
|
var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
|
||||||
if (currentY + lineHeight > y + cellHeight - paddingBottomPoints + 0.001)
|
var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
|
||||||
break;
|
var paddingTopPoints = MmToPoints(_settings.cellPaddingTopMm);
|
||||||
|
var paddingBottomPoints = MmToPoints(_settings.cellPaddingBottomMm);
|
||||||
|
|
||||||
// Parse and draw the line with markdown support
|
var maxWidth = Math.Max(0, cellWidth - paddingLeftPoints - paddingRightPoints);
|
||||||
DrawLineWithMarkdown(gfx, line, x + paddingLeftPoints, currentY, maxWidth);
|
|
||||||
currentY += lineHeight;
|
// Split text by newlines and remove empty trailing lines
|
||||||
|
var rawLines = text.Split(new[] { "\n" }, StringSplitOptions.None);
|
||||||
|
var lines = rawLines.Where(l => l != null).ToArray();
|
||||||
|
|
||||||
|
// Use a conservative line height in points
|
||||||
|
var lineHeight = _regularFont.Size * 1.2;
|
||||||
|
|
||||||
|
// Calculate total height of the text block
|
||||||
|
var totalHeight = lines.Length * lineHeight;
|
||||||
|
|
||||||
|
// Start drawing from the top of the cell (align addresses to top)
|
||||||
|
var startY = y + paddingTopPoints;
|
||||||
|
|
||||||
|
var currentY = startY;
|
||||||
|
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
// Stop if we've reached the top boundary
|
||||||
|
if (currentY + lineHeight > y + cellHeight - paddingBottomPoints + 0.001)
|
||||||
|
break;
|
||||||
|
|
||||||
|
// Parse and draw the line with markdown support
|
||||||
|
DrawLineWithMarkdown(gfx, line, x + paddingLeftPoints, currentY, maxWidth);
|
||||||
|
currentY += lineHeight;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing markdown text: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DrawLineWithMarkdown(XGraphics gfx, string line, double x, double y, double maxWidth)
|
private void DrawLineWithMarkdown(XGraphics gfx, string line, double x, double y, double maxWidth)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(line)) return;
|
try
|
||||||
var currentX = x;
|
|
||||||
var i = 0;
|
|
||||||
|
|
||||||
while (i < line.Length)
|
|
||||||
{
|
{
|
||||||
if (currentX - x >= maxWidth)
|
if (string.IsNullOrWhiteSpace(line)) return;
|
||||||
break;
|
var currentX = x;
|
||||||
|
var i = 0;
|
||||||
|
|
||||||
var remainingWidth = maxWidth - (currentX - x);
|
while (i < line.Length)
|
||||||
|
|
||||||
// Check for small-font tag <font6> ... </font6>
|
|
||||||
if (i <= line.Length - 7 && line.Substring(i, 7) == "<font6>")
|
|
||||||
{
|
{
|
||||||
var endTag = line.IndexOf("</font6>", i + 7, StringComparison.Ordinal);
|
if (currentX - x >= maxWidth)
|
||||||
if (endTag != -1)
|
break;
|
||||||
{
|
|
||||||
var inner = line.Substring(i + 7, endTag - (i + 7));
|
|
||||||
if (!string.IsNullOrEmpty(inner))
|
|
||||||
{
|
|
||||||
var measuredSmall = gfx.MeasureString(inner, _smallFont);
|
|
||||||
|
|
||||||
if (measuredSmall.Width > remainingWidth)
|
var remainingWidth = maxWidth - (currentX - x);
|
||||||
|
|
||||||
|
// Check for small-font tag <font6> ... </font6>
|
||||||
|
if (i <= line.Length - 7 && line.Substring(i, 7) == "<font6>")
|
||||||
|
{
|
||||||
|
var endTag = line.IndexOf("</font6>", i + 7, StringComparison.Ordinal);
|
||||||
|
if (endTag != -1)
|
||||||
|
{
|
||||||
|
var inner = line.Substring(i + 7, endTag - (i + 7));
|
||||||
|
if (!string.IsNullOrEmpty(inner))
|
||||||
{
|
{
|
||||||
inner = TruncateTextToWidth(gfx, inner, _smallFont, remainingWidth);
|
var measuredSmall = gfx.MeasureString(inner, _smallFont);
|
||||||
measuredSmall = gfx.MeasureString(inner, _smallFont);
|
|
||||||
|
if (measuredSmall.Width > remainingWidth)
|
||||||
|
{
|
||||||
|
inner = TruncateTextToWidth(gfx, inner, _smallFont, remainingWidth);
|
||||||
|
measuredSmall = gfx.MeasureString(inner, _smallFont);
|
||||||
|
}
|
||||||
|
|
||||||
|
gfx.DrawString(inner, _smallFont, XBrushes.Black,
|
||||||
|
new XRect(currentX, y, remainingWidth, _smallFont.Size * 1.2),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
currentX += measuredSmall.Width;
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx.DrawString(inner, _smallFont, XBrushes.Black,
|
i = endTag + 8; // move past </font6>
|
||||||
new XRect(currentX, y, remainingWidth, _smallFont.Size * 1.2),
|
continue;
|
||||||
XStringFormats.TopLeft);
|
|
||||||
currentX += measuredSmall.Width;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
i = endTag + 8; // move past </font6>
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Check for bold marker (**)
|
// Check for bold marker (**)
|
||||||
if (i < line.Length - 1 && line[i] == '*' && line[i + 1] == '*')
|
if (i < line.Length - 1 && line[i] == '*' && line[i + 1] == '*')
|
||||||
{
|
|
||||||
// Find closing **
|
|
||||||
var endIndex = line.IndexOf("**", i + 2, StringComparison.Ordinal);
|
|
||||||
if (endIndex != -1)
|
|
||||||
{
|
{
|
||||||
var boldText = line.Substring(i + 2, endIndex - (i + 2));
|
// Find closing **
|
||||||
var measured = gfx.MeasureString(boldText, _boldFont);
|
var endIndex = line.IndexOf("**", i + 2, StringComparison.Ordinal);
|
||||||
|
if (endIndex != -1)
|
||||||
|
{
|
||||||
|
var boldText = line.Substring(i + 2, endIndex - (i + 2));
|
||||||
|
var measured = gfx.MeasureString(boldText, _boldFont);
|
||||||
|
|
||||||
|
if (measured.Width > remainingWidth)
|
||||||
|
{
|
||||||
|
boldText = TruncateTextToWidth(gfx, boldText, _boldFont, remainingWidth);
|
||||||
|
measured = gfx.MeasureString(boldText, _boldFont);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw bold text and measure width accurately
|
||||||
|
gfx.DrawString(boldText, _boldFont, XBrushes.Black,
|
||||||
|
new XRect(currentX, y, remainingWidth, _boldFont.Size * 1.2),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
currentX += measured.Width;
|
||||||
|
i = endIndex + 2;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regular text until next ** or end of line
|
||||||
|
var nextBoldIndex = line.IndexOf("**", i, StringComparison.Ordinal);
|
||||||
|
var textEnd = nextBoldIndex == -1 ? line.Length : nextBoldIndex;
|
||||||
|
var regularText = line.Substring(i, textEnd - i);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(regularText))
|
||||||
|
{
|
||||||
|
var measured = gfx.MeasureString(regularText, _regularFont);
|
||||||
|
|
||||||
if (measured.Width > remainingWidth)
|
if (measured.Width > remainingWidth)
|
||||||
{
|
{
|
||||||
boldText = TruncateTextToWidth(gfx, boldText, _boldFont, remainingWidth);
|
regularText = TruncateTextToWidth(gfx, regularText, _regularFont, remainingWidth);
|
||||||
measured = gfx.MeasureString(boldText, _boldFont);
|
measured = gfx.MeasureString(regularText, _regularFont);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw bold text and measure width accurately
|
gfx.DrawString(regularText, _regularFont, XBrushes.Black,
|
||||||
gfx.DrawString(boldText, _boldFont, XBrushes.Black,
|
new XRect(currentX, y, remainingWidth, _regularFont.Size * 1.2), XStringFormats.TopLeft);
|
||||||
new XRect(currentX, y, remainingWidth, _boldFont.Size * 1.2),
|
|
||||||
XStringFormats.TopLeft);
|
|
||||||
currentX += measured.Width;
|
currentX += measured.Width;
|
||||||
i = endIndex + 2;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Regular text until next ** or end of line
|
|
||||||
var nextBoldIndex = line.IndexOf("**", i, StringComparison.Ordinal);
|
|
||||||
var textEnd = nextBoldIndex == -1 ? line.Length : nextBoldIndex;
|
|
||||||
var regularText = line.Substring(i, textEnd - i);
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(regularText))
|
|
||||||
{
|
|
||||||
var measured = gfx.MeasureString(regularText, _regularFont);
|
|
||||||
|
|
||||||
if (measured.Width > remainingWidth)
|
|
||||||
{
|
|
||||||
regularText = TruncateTextToWidth(gfx, regularText, _regularFont, remainingWidth);
|
|
||||||
measured = gfx.MeasureString(regularText, _regularFont);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx.DrawString(regularText, _regularFont, XBrushes.Black,
|
i = textEnd;
|
||||||
new XRect(currentX, y, remainingWidth, _regularFont.Size * 1.2), XStringFormats.TopLeft);
|
|
||||||
currentX += measured.Width;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
i = textEnd;
|
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing markdown line: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private string TruncateTextToWidth(XGraphics gfx, string text, XFont font, double maxWidth)
|
private string TruncateTextToWidth(XGraphics gfx, string text, XFont font, double maxWidth)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(text))
|
try
|
||||||
return text;
|
|
||||||
|
|
||||||
for (var len = text.Length; len > 0; len--)
|
|
||||||
{
|
{
|
||||||
var truncated = text.Substring(0, len);
|
if (string.IsNullOrEmpty(text))
|
||||||
var measured = gfx.MeasureString(truncated, font);
|
return text;
|
||||||
if (measured.Width <= maxWidth)
|
|
||||||
return truncated;
|
for (var len = text.Length; len > 0; len--)
|
||||||
|
{
|
||||||
|
var truncated = text.Substring(0, len);
|
||||||
|
var measured = gfx.MeasureString(truncated, font);
|
||||||
|
if (measured.Width <= maxWidth)
|
||||||
|
return truncated;
|
||||||
|
}
|
||||||
|
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while truncating text to width: {ex.Message}",Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
return string.Empty;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
+85
-58
@@ -62,75 +62,102 @@ public class StableFontResolver : IFontResolver
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// ignore resolver init errors
|
Logger.Log($"Error while initializing FontResolver: {ex.Message}",Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string NormalizeStyle(string s)
|
private static string NormalizeStyle(string s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s)) return "Regular";
|
try
|
||||||
s = s.ToLowerInvariant();
|
|
||||||
if (s.Contains("bold") && s.Contains("italic")) return "BoldItalic";
|
|
||||||
if (s.Contains("bold")) return "Bold";
|
|
||||||
if (s.Contains("italic") || s.Contains("oblique")) return "Italic";
|
|
||||||
if (s.Contains("regular") || s == "r") return "Regular";
|
|
||||||
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
|
||||||
{
|
|
||||||
// If requested family exists, pick corresponding style if available
|
|
||||||
string familyToUse = null;
|
|
||||||
if (!string.IsNullOrEmpty(familyName) && _families.ContainsKey(familyName))
|
|
||||||
familyToUse = familyName;
|
|
||||||
|
|
||||||
if (familyToUse == null && _orderedFamilies.Count > 0)
|
|
||||||
familyToUse = _orderedFamilies[0];
|
|
||||||
|
|
||||||
if (familyToUse == null)
|
|
||||||
return new FontResolverInfo("Arial");
|
|
||||||
|
|
||||||
var style = "Regular";
|
|
||||||
if (isBold && isItalic) style = "BoldItalic";
|
|
||||||
else if (isBold) style = "Bold";
|
|
||||||
else if (isItalic) style = "Italic";
|
|
||||||
|
|
||||||
// Face name format: Family#Style
|
|
||||||
return new FontResolverInfo($"{familyToUse}#{style}");
|
|
||||||
}
|
|
||||||
|
|
||||||
public byte[] GetFont(string faceName)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(faceName)) return null;
|
|
||||||
|
|
||||||
// faceName expected as "Family#Style" or just "Family"
|
|
||||||
var family = faceName;
|
|
||||||
var style = "Regular";
|
|
||||||
var idx = faceName.IndexOf('#');
|
|
||||||
if (idx >= 0)
|
|
||||||
{
|
{
|
||||||
family = faceName.Substring(0, idx);
|
if (string.IsNullOrEmpty(s)) return "Regular";
|
||||||
style = faceName.Substring(idx + 1);
|
s = s.ToLowerInvariant();
|
||||||
|
if (s.Contains("bold") && s.Contains("italic")) return "BoldItalic";
|
||||||
|
if (s.Contains("bold")) return "Bold";
|
||||||
|
if (s.Contains("italic") || s.Contains("oblique")) return "Italic";
|
||||||
|
if (s.Contains("regular") || s == "r") return "Regular";
|
||||||
|
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
style = NormalizeStyle(style);
|
|
||||||
|
|
||||||
if (_families.TryGetValue(family, out var dict))
|
|
||||||
{
|
{
|
||||||
// Try exact style
|
Logger.Log($"Error while normalizing style: {ex.Message}",Logger.LogType.Error);
|
||||||
if (dict.TryGetValue(style, out var data)) return data;
|
|
||||||
|
|
||||||
// Fallback order
|
|
||||||
if (style != "Regular" && dict.TryGetValue("Regular", out data)) return data;
|
|
||||||
if (dict.TryGetValue("Bold", out data)) return data;
|
|
||||||
if (dict.TryGetValue("Italic", out data)) return data;
|
|
||||||
|
|
||||||
// Any available
|
|
||||||
foreach (var kv in dict) return kv.Value;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// If requested family exists, pick corresponding style if available
|
||||||
|
string familyToUse = null;
|
||||||
|
if (!string.IsNullOrEmpty(familyName) && _families.ContainsKey(familyName))
|
||||||
|
familyToUse = familyName;
|
||||||
|
|
||||||
|
if (familyToUse == null && _orderedFamilies.Count > 0)
|
||||||
|
familyToUse = _orderedFamilies[0];
|
||||||
|
|
||||||
|
if (familyToUse == null)
|
||||||
|
return new FontResolverInfo("Arial");
|
||||||
|
|
||||||
|
var style = "Regular";
|
||||||
|
if (isBold && isItalic) style = "BoldItalic";
|
||||||
|
else if (isBold) style = "Bold";
|
||||||
|
else if (isItalic) style = "Italic";
|
||||||
|
|
||||||
|
// Face name format: Family#Style
|
||||||
|
return new FontResolverInfo($"{familyToUse}#{style}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while resolving typeface: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] GetFont(string faceName)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(faceName)) return null;
|
||||||
|
|
||||||
|
// faceName expected as "Family#Style" or just "Family"
|
||||||
|
var family = faceName;
|
||||||
|
var style = "Regular";
|
||||||
|
var idx = faceName.IndexOf('#');
|
||||||
|
if (idx >= 0)
|
||||||
|
{
|
||||||
|
family = faceName.Substring(0, idx);
|
||||||
|
style = faceName.Substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
style = NormalizeStyle(style);
|
||||||
|
|
||||||
|
if (_families.TryGetValue(family, out var dict))
|
||||||
|
{
|
||||||
|
// Try exact style
|
||||||
|
if (dict.TryGetValue(style, out var data)) return data;
|
||||||
|
|
||||||
|
// Fallback order
|
||||||
|
if (style != "Regular" && dict.TryGetValue("Regular", out data)) return data;
|
||||||
|
if (dict.TryGetValue("Bold", out data)) return data;
|
||||||
|
if (dict.TryGetValue("Italic", out data)) return data;
|
||||||
|
|
||||||
|
// Any available
|
||||||
|
foreach (var kv in dict) return kv.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while getting font: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-16
@@ -11,19 +11,23 @@ public partial class EditorWindow : Window
|
|||||||
|
|
||||||
public EditorWindow(string filename = "")
|
public EditorWindow(string filename = "")
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
try
|
||||||
this.filename = filename;
|
|
||||||
if (!string.IsNullOrWhiteSpace(filename) && File.Exists(filename))
|
|
||||||
{
|
{
|
||||||
var content = TbContent;
|
InitializeComponent();
|
||||||
if (content != null) content.Text = File.ReadAllText(this.filename);
|
this.filename = PathUtilities.NormalizeFileSystemPath(filename);
|
||||||
Title = "Wiki Editor - " + filename;
|
if (!string.IsNullOrWhiteSpace(this.filename) && File.Exists(this.filename))
|
||||||
}
|
{
|
||||||
else if (!string.IsNullOrWhiteSpace(filename))
|
var content = TbContent;
|
||||||
{
|
if (content != null) content.Text = File.ReadAllText(this.filename);
|
||||||
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
Title = "Wiki Editor - " + filename;
|
||||||
Close();
|
}
|
||||||
}
|
else if (!string.IsNullOrWhiteSpace(this.filename))
|
||||||
|
{
|
||||||
|
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -31,20 +35,22 @@ public partial class EditorWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
File.WriteAllText(filename, TbContent.Text);
|
File.WriteAllText(filename, TbContent.Text);
|
||||||
MainWindow._instance.PopulateNavTree();
|
MainWindow._instance.PopulateNavTree(filename, filename);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(null,
|
MessageBox.Show(null,
|
||||||
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
||||||
ex.StackTrace, "Fehler");
|
ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
MessageBox.Show(null,
|
MessageBox.Show(null,
|
||||||
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " + Global._instance.wiki_storage_path,
|
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " +
|
||||||
|
PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path),
|
||||||
"Fehler");
|
"Fehler");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,9 +61,9 @@ public partial class EditorWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
File.Delete(filename);
|
File.Delete(filename);
|
||||||
} catch {}
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
MainWindow._instance.PopulateNavTree();
|
MainWindow._instance.PopulateNavTree();
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+107
-96
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Media;
|
using Avalonia.Media;
|
||||||
@@ -12,118 +13,128 @@ public static class MarkdownRenderer
|
|||||||
{
|
{
|
||||||
public static Control Render(string markdown)
|
public static Control Render(string markdown)
|
||||||
{
|
{
|
||||||
var panel = new StackPanel { Spacing = 6 };
|
try
|
||||||
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
|
||||||
|
|
||||||
var doc = Markdown.Parse(markdown);
|
|
||||||
|
|
||||||
foreach (var block in doc)
|
|
||||||
{
|
{
|
||||||
switch (block)
|
var panel = new StackPanel { Spacing = 6 };
|
||||||
|
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||||
|
|
||||||
|
var doc = Markdown.Parse(markdown);
|
||||||
|
|
||||||
|
foreach (var block in doc)
|
||||||
{
|
{
|
||||||
case HeadingBlock hb:
|
switch (block)
|
||||||
{
|
{
|
||||||
var text = GetInlineText(hb.Inline);
|
case HeadingBlock hb:
|
||||||
var tb = new TextBlock
|
|
||||||
{
|
{
|
||||||
Text = text,
|
var text = GetInlineText(hb.Inline);
|
||||||
FontWeight = FontWeight.Bold,
|
var tb = new TextBlock
|
||||||
Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
|
||||||
};
|
|
||||||
tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
|
|
||||||
panel.Children.Add(tb);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case ParagraphBlock pb:
|
|
||||||
{
|
|
||||||
var text = GetInlineText(pb.Inline);
|
|
||||||
var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
|
||||||
panel.Children.Add(tb);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case FencedCodeBlock cb:
|
|
||||||
{
|
|
||||||
var sb = new StringBuilder();
|
|
||||||
foreach (var line in cb.Lines.Lines)
|
|
||||||
{
|
|
||||||
sb.Append(line.ToString());
|
|
||||||
}
|
|
||||||
var codeBox = new TextBox
|
|
||||||
{
|
|
||||||
Text = sb.ToString(),
|
|
||||||
FontFamily = "Consolas, monospace",
|
|
||||||
IsReadOnly = true,
|
|
||||||
AcceptsReturn = true
|
|
||||||
};
|
|
||||||
panel.Children.Add(codeBox);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case ListBlock lb:
|
|
||||||
{
|
|
||||||
var sp = new StackPanel { Spacing = 2 };
|
|
||||||
var number = 1;
|
|
||||||
foreach (var item in lb)
|
|
||||||
{
|
|
||||||
if (item is ListItemBlock lib)
|
|
||||||
{
|
{
|
||||||
var itemText = new StringBuilder();
|
Text = text,
|
||||||
foreach (var sub in lib)
|
FontWeight = FontWeight.Bold,
|
||||||
{
|
Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
||||||
if (sub is ParagraphBlock pp)
|
};
|
||||||
itemText.Append(GetInlineText(pp.Inline));
|
tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
|
||||||
}
|
panel.Children.Add(tb);
|
||||||
var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
break;
|
||||||
sp.Children.Add(tb);
|
}
|
||||||
}
|
|
||||||
|
case ParagraphBlock pb:
|
||||||
|
{
|
||||||
|
var text = GetInlineText(pb.Inline);
|
||||||
|
var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
||||||
|
panel.Children.Add(tb);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case FencedCodeBlock cb:
|
||||||
|
{
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
foreach (var line in cb.Lines.Lines)
|
||||||
|
{
|
||||||
|
sb.Append(line.ToString());
|
||||||
|
}
|
||||||
|
var codeBox = new TextBox
|
||||||
|
{
|
||||||
|
Text = sb.ToString(),
|
||||||
|
FontFamily = "Consolas, monospace",
|
||||||
|
IsReadOnly = true,
|
||||||
|
AcceptsReturn = true
|
||||||
|
};
|
||||||
|
panel.Children.Add(codeBox);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case ListBlock lb:
|
||||||
|
{
|
||||||
|
var sp = new StackPanel { Spacing = 2 };
|
||||||
|
var number = 1;
|
||||||
|
foreach (var item in lb)
|
||||||
|
{
|
||||||
|
if (item is ListItemBlock lib)
|
||||||
|
{
|
||||||
|
var itemText = new StringBuilder();
|
||||||
|
foreach (var sub in lib)
|
||||||
|
{
|
||||||
|
if (sub is ParagraphBlock pp)
|
||||||
|
itemText.Append(GetInlineText(pp.Inline));
|
||||||
|
}
|
||||||
|
var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
||||||
|
sp.Children.Add(tb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
panel.Children.Add(sp);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
// fallback: raw text
|
||||||
|
panel.Children.Add(new TextBlock { Text = block.ToString() });
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
panel.Children.Add(sp);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
// fallback: raw text
|
|
||||||
panel.Children.Add(new TextBlock { Text = block.ToString() });
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
return panel;
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
return panel;
|
return new Panel();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetInlineText(ContainerInline? container)
|
private static string GetInlineText(ContainerInline? container)
|
||||||
{
|
{
|
||||||
if (container == null) return string.Empty;
|
try
|
||||||
var sb = new StringBuilder();
|
|
||||||
foreach (var inline in container)
|
|
||||||
{
|
{
|
||||||
switch (inline)
|
if (container == null) return string.Empty;
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
foreach (var inline in container)
|
||||||
{
|
{
|
||||||
case LiteralInline li:
|
switch (inline)
|
||||||
sb.Append(li.Content.ToString());
|
{
|
||||||
break;
|
case LiteralInline li:
|
||||||
case EmphasisInline ei:
|
sb.Append(li.Content.ToString());
|
||||||
sb.Append(GetInlineText(ei));
|
break;
|
||||||
break;
|
case EmphasisInline ei:
|
||||||
case CodeInline ci:
|
sb.Append(GetInlineText(ei));
|
||||||
sb.Append(ci.Content);
|
break;
|
||||||
break;
|
case CodeInline ci:
|
||||||
case LinkInline li:
|
sb.Append(ci.Content);
|
||||||
sb.Append(GetInlineText(li));
|
break;
|
||||||
break;
|
case LinkInline li:
|
||||||
case LineBreakInline:
|
sb.Append(GetInlineText(li));
|
||||||
sb.Append("\n");
|
break;
|
||||||
break;
|
case LineBreakInline:
|
||||||
default:
|
sb.Append("\n");
|
||||||
sb.Append(inline.ToString());
|
break;
|
||||||
break;
|
default:
|
||||||
|
sb.Append(inline.ToString());
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-3
@@ -13,7 +13,7 @@ public class WikiService
|
|||||||
// prefer global wiki storage path if configured
|
// prefer global wiki storage path if configured
|
||||||
if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||||
{
|
{
|
||||||
var cfg = Global._instance.wiki_storage_path;
|
var cfg = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
WikiRootFullPath = Path.IsPathRooted(cfg)
|
WikiRootFullPath = Path.IsPathRooted(cfg)
|
||||||
? cfg
|
? cfg
|
||||||
: Path.Combine(Directory.GetCurrentDirectory(), cfg);
|
: Path.Combine(Directory.GetCurrentDirectory(), cfg);
|
||||||
@@ -25,8 +25,11 @@ public class WikiService
|
|||||||
wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient",
|
"logofclient",
|
||||||
"wiki");
|
"wiki");
|
||||||
|
wikiRoot = PathUtilities.NormalizeFileSystemPath(wikiRoot);
|
||||||
WikiRoot = wikiRoot;
|
WikiRoot = wikiRoot;
|
||||||
WikiRootFullPath = Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
WikiRootFullPath = Path.IsPathRooted(wikiRoot)
|
||||||
|
? wikiRoot
|
||||||
|
: Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,4 +71,4 @@ public class WikiService
|
|||||||
if (!File.Exists(path)) return Task.FromResult<string?>(null);
|
if (!File.Exists(path)) return Task.FromResult<string?>(null);
|
||||||
return File.ReadAllTextAsync(path);
|
return File.ReadAllTextAsync(path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,157 +0,0 @@
|
|||||||
\documentclass[a4paper]{article}
|
|
||||||
\usepackage{graphicx}
|
|
||||||
\usepackage[left=3cm,right=3cm,top=3cm, bottom=3cm]{geometry}
|
|
||||||
\usepackage{amsmath}
|
|
||||||
\usepackage{amssymb}
|
|
||||||
\usepackage[headsepline, footsepline]{scrlayer-scrpage}
|
|
||||||
\usepackage{enumerate}
|
|
||||||
\usepackage{dsfont}
|
|
||||||
\usepackage[]{mathtools}
|
|
||||||
\usepackage[]{mathbbol}
|
|
||||||
\usepackage{multicol}
|
|
||||||
\usepackage{enumitem}
|
|
||||||
\usepackage[hidelinks]{hyperref}
|
|
||||||
\usepackage[]{circuitikz}
|
|
||||||
\usepackage{tcolorbox} % Für schöne Boxen
|
|
||||||
\usetikzlibrary{circuits.logic.IEC}
|
|
||||||
\usepackage{tikz}
|
|
||||||
\usepackage{tkz-graph}
|
|
||||||
\usepackage{listings}
|
|
||||||
\usepackage{xcolor}
|
|
||||||
|
|
||||||
\setlist{itemsep=0.3em, topsep=0.5em, parsep=0pt}
|
|
||||||
|
|
||||||
\newcommand{\bpf}[1]{%
|
|
||||||
\par\vspace{0.8\baselineskip}% Abstand vor der Überschrift
|
|
||||||
\noindent\textbf{#1}% Fettgedruckte Überschrift
|
|
||||||
\par\vspace{0.3\baselineskip}% Abstand nach der Überschrift
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\renewcommand{\contentsname}{Inhaltsverzeichnis}
|
|
||||||
\renewcommand{\figurename}{Grafik}
|
|
||||||
\renewcommand{\partname}{Teil}
|
|
||||||
\renewcommand{\epsilon}{\varepsilon}
|
|
||||||
|
|
||||||
\definecolor{darkgrey}{HTML}{232327}
|
|
||||||
|
|
||||||
% Zählerdefinition mit AUTOMATISCHEM SUBSECTION-RESET
|
|
||||||
\newcounter{commoncounter}[subsection]
|
|
||||||
\renewcommand{\thecommoncounter}{\thesubsection.\arabic{commoncounter}}
|
|
||||||
|
|
||||||
% Zähler direkt bei Dokumentstart initialisieren
|
|
||||||
\AtBeginDocument{\setcounter{commoncounter}{0}}
|
|
||||||
|
|
||||||
% BOX-DEFINITIONEN mit korrigierter Zählerlogik
|
|
||||||
\newtcolorbox{definitionbox}[1][]{
|
|
||||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
|
||||||
title={Definition \thecommoncounter: #1},
|
|
||||||
colback=white,
|
|
||||||
colframe=white!75!darkgrey,
|
|
||||||
fonttitle=\bfseries,
|
|
||||||
boxrule=0.6mm,
|
|
||||||
coltitle=black,
|
|
||||||
rounded corners,
|
|
||||||
before skip=10pt,
|
|
||||||
after skip=10pt
|
|
||||||
}
|
|
||||||
|
|
||||||
\newtcolorbox{examplebox}[1][]{
|
|
||||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
|
||||||
title={Beispiel \thecommoncounter: #1},
|
|
||||||
colback=white,
|
|
||||||
colframe=white!75!orange,
|
|
||||||
fonttitle=\bfseries,
|
|
||||||
boxrule=0.6mm,
|
|
||||||
coltitle=black,
|
|
||||||
rounded corners,
|
|
||||||
before skip=10pt,
|
|
||||||
after skip=10pt
|
|
||||||
}
|
|
||||||
|
|
||||||
\newtcolorbox{satzbox}[1][]{
|
|
||||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
|
||||||
title={Satz \thecommoncounter: #1},
|
|
||||||
colback=white,
|
|
||||||
colframe=white!75!blue,
|
|
||||||
fonttitle=\bfseries,
|
|
||||||
boxrule=0.6mm,
|
|
||||||
coltitle=black,
|
|
||||||
rounded corners,
|
|
||||||
before skip=10pt,
|
|
||||||
after skip=10pt
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\definecolor{codegreen}{rgb}{0,0.6,0}
|
|
||||||
\definecolor{codeblue}{rgb}{0,0,0.8}
|
|
||||||
\definecolor{codered}{rgb}{0.8,0,0}
|
|
||||||
\definecolor{lightgray}{rgb}{0.95,0.95,0.95}
|
|
||||||
|
|
||||||
\lstdefinestyle{CSharpStyle}{
|
|
||||||
language=Python,
|
|
||||||
basicstyle=\ttfamily\small, % Monospace-Schrift
|
|
||||||
keywordstyle=\color{blue}\bfseries, % Schlüsselwörter fett und blau
|
|
||||||
stringstyle=\color{red}, % Strings rot
|
|
||||||
commentstyle=\color{codegreen}, % Kommentare grün
|
|
||||||
backgroundcolor=\color{lightgray}, % Hintergrundfarbe
|
|
||||||
numbers=left, % Zeilennummern links
|
|
||||||
numbersep=10px, % Abstand zwischen Zeilennummern und Code
|
|
||||||
numberstyle=\color{gray}\texttt,
|
|
||||||
stepnumber=1, % Zeilennummerierung Schrittweite 1
|
|
||||||
frame=single, % Rahmen um den Code
|
|
||||||
tabsize=4, % Tabulatorgröße
|
|
||||||
breaklines=true, % Zeilenumbruch aktivieren
|
|
||||||
captionpos=none,
|
|
||||||
showstringspaces=false,
|
|
||||||
xleftmargin=15pt, % Linker Rand für den Code (verschiebt alles nach rechts)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
% Umgebung für Listings mit Titel und Zähler
|
|
||||||
\newenvironment{codeexample}[1][]{
|
|
||||||
\refstepcounter{commoncounter} % Zähler erhöhen
|
|
||||||
\lstset{
|
|
||||||
style=CSharpStyle,
|
|
||||||
caption={Listing \thecommoncounter: #1}, % Titel mit Zähler
|
|
||||||
label={listing:\thecommoncounter}
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
|
|
||||||
|
|
||||||
\setlength{\parindent}{0pt}
|
|
||||||
|
|
||||||
\title{\includegraphics[width=0.3\textwidth]{../assets/icon.png}\vspace{15pt}\\Logof Client\\
|
|
||||||
Handbuch}
|
|
||||||
\author{Elias Fierke}
|
|
||||||
\pagestyle{scrheadings}
|
|
||||||
\date{Oktober 2025}
|
|
||||||
\begin{document}
|
|
||||||
|
|
||||||
\ohead{Oktober 2025}
|
|
||||||
\ofoot{Seite {\pagemark} von \pageref{LastPage}}
|
|
||||||
\ihead{Logof Client Handbuch}
|
|
||||||
\maketitle
|
|
||||||
|
|
||||||
|
|
||||||
\tableofcontents
|
|
||||||
|
|
||||||
\newpage
|
|
||||||
\part{Einführung}
|
|
||||||
|
|
||||||
|
|
||||||
\newpage
|
|
||||||
\part{Installation}
|
|
||||||
|
|
||||||
\newpage
|
|
||||||
\part{Adress-Verwaltung}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\label{LastPage}
|
|
||||||
\end{document}
|
|
||||||
Reference in New Issue
Block a user