tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #587 from Mbucari/master

Browse Source 
Serilog log to zip file
This commit is contained in:
rmcrackan 2023-04-15 15:53:41 -04:00 committed by GitHub
commit 1ab882f327
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 105 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/AppScaffolding/AppScaffolding.csproj
View File

@ -5,7 +5,8 @@
<Version>10.1.0.1</Version> <Version>10.1.0.1</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Octokit" Version="5.0.2" /> <PackageReference Include="Octokit" Version="5.0.4" />
<PackageReference Include="Serilog.Sinks.ZipFile" Version="1.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" /> <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

11
Source/AppScaffolding/LibationScaffolding.cs
View File

@ -118,8 +118,15 @@ namespace AppScaffolding
private static void ensureSerilogConfig(Configuration config) private static void ensureSerilogConfig(Configuration config)
{ {
if (config.GetObject("Serilog") is not null) if (config.GetObject("Serilog") is JObject serilog)
{
if (serilog["WriteTo"] is JArray sinks && sinks.FirstOrDefault(s => s["Name"].Value<string>() is "File") is JToken fileSink)
{
fileSink["Name"] = "ZipFile";
config.SetNonString(serilog.DeepClone(), "Serilog");
}
return; return;
}
var serilogObj = new JObject var serilogObj = new JObject
{ {
@ -129,7 +136,7 @@ namespace AppScaffolding
// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved // new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
new JObject new JObject
{ {
{ "Name", "File" }, { "Name", "ZipFile" },
{ "Args", { "Args",
new JObject new JObject
{ {

2
Source/AudibleUtilities/AudibleUtilities.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AudibleApi" Version="8.2.3.1" /> <PackageReference Include="AudibleApi" Version="8.3.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
Source/FileManager/BackgroundFileSystem.cs
View File

@ -147,7 +147,8 @@ namespace FileManager
private void AddPath(LongPath path) private void AddPath(LongPath path)
{ {
path = path.LongPathName; path = path.LongPathName;
if (!File.Exists(path) && !Directory.Exists(path)) //Temporary files created when updating the db will disappear before their attributes can be read.
if (Path.GetFileName(path).Contains("LibationContext.db") || !File.Exists(path) && !Directory.Exists(path))
return; return;
if (File.GetAttributes(path).HasFlag(FileAttributes.Directory)) if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption)); AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));

8
Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
View File

@ -2,9 +2,9 @@
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" d:DesignWidth="350" d:DesignHeight="200" mc:Ignorable="d" d:DesignWidth="360" d:DesignHeight="200"
MinWidth="350" MinHeight="200" MinWidth="370" MinHeight="200"
Width="350" Height="200" Width="370" Height="200"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"
xmlns:controls="clr-namespace:LibationAvalonia.Controls" xmlns:controls="clr-namespace:LibationAvalonia.Controls"
x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog" x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
@ -60,7 +60,7 @@
<controls:LinkLabel <controls:LinkLabel
Tapped="ExternalLoginLink_Tapped" Tapped="ExternalLoginLink_Tapped"
Text="Or click here to log in with your browser." /> Text="Trouble logging in? Click here to log in with your browser." />
<TextBlock <TextBlock
TextWrapping="Wrap" TextWrapping="Wrap"

177
Source/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.Designer.cs generated
View File

@ -28,123 +28,120 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.passwordLbl = new System.Windows.Forms.Label(); passwordLbl = new System.Windows.Forms.Label();
this.passwordTb = new System.Windows.Forms.TextBox(); passwordTb = new System.Windows.Forms.TextBox();
this.submitBtn = new System.Windows.Forms.Button(); submitBtn = new System.Windows.Forms.Button();
this.localeLbl = new System.Windows.Forms.Label(); localeLbl = new System.Windows.Forms.Label();
this.usernameLbl = new System.Windows.Forms.Label(); usernameLbl = new System.Windows.Forms.Label();
this.externalLoginLink = new System.Windows.Forms.LinkLabel(); externalLoginLink = new System.Windows.Forms.LinkLabel();
this.externalLoginLbl2 = new System.Windows.Forms.Label(); externalLoginLbl2 = new System.Windows.Forms.Label();
this.externalLoginLbl1 = new System.Windows.Forms.Label(); externalLoginLbl1 = new System.Windows.Forms.Label();
this.SuspendLayout(); SuspendLayout();
// //
// passwordLbl // passwordLbl
// //
this.passwordLbl.AutoSize = true; passwordLbl.AutoSize = true;
this.passwordLbl.Location = new System.Drawing.Point(14, 47); passwordLbl.Location = new System.Drawing.Point(14, 47);
this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.passwordLbl.Name = "passwordLbl"; passwordLbl.Name = "passwordLbl";
this.passwordLbl.Size = new System.Drawing.Size(57, 15); passwordLbl.Size = new System.Drawing.Size(57, 15);
this.passwordLbl.TabIndex = 2; passwordLbl.TabIndex = 2;
this.passwordLbl.Text = "Password"; passwordLbl.Text = "Password";
// //
// passwordTb // passwordTb
// //
this.passwordTb.Location = new System.Drawing.Point(83, 44); passwordTb.Location = new System.Drawing.Point(83, 44);
this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.passwordTb.Name = "passwordTb"; passwordTb.Name = "passwordTb";
this.passwordTb.PasswordChar = '*'; passwordTb.PasswordChar = '*';
this.passwordTb.Size = new System.Drawing.Size(233, 23); passwordTb.Size = new System.Drawing.Size(233, 23);
this.passwordTb.TabIndex = 3; passwordTb.TabIndex = 3;
// //
// submitBtn // submitBtn
// //
this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); submitBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
this.submitBtn.Location = new System.Drawing.Point(293, 176); submitBtn.Location = new System.Drawing.Point(293, 176);
this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.submitBtn.Name = "submitBtn"; submitBtn.Name = "submitBtn";
this.submitBtn.Size = new System.Drawing.Size(88, 27); submitBtn.Size = new System.Drawing.Size(88, 27);
this.submitBtn.TabIndex = 7; submitBtn.TabIndex = 7;
this.submitBtn.Text = "Submit"; submitBtn.Text = "Submit";
this.submitBtn.UseVisualStyleBackColor = true; submitBtn.UseVisualStyleBackColor = true;
this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click); submitBtn.Click += submitBtn_Click;
// //
// localeLbl // localeLbl
// //
this.localeLbl.AutoSize = true; localeLbl.AutoSize = true;
this.localeLbl.Location = new System.Drawing.Point(14, 10); localeLbl.Location = new System.Drawing.Point(14, 10);
this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.localeLbl.Name = "localeLbl"; localeLbl.Name = "localeLbl";
this.localeLbl.Size = new System.Drawing.Size(61, 15); localeLbl.Size = new System.Drawing.Size(61, 15);
this.localeLbl.TabIndex = 0; localeLbl.TabIndex = 0;
this.localeLbl.Text = "Locale: {0}"; localeLbl.Text = "Locale: {0}";
// //
// usernameLbl // usernameLbl
// //
this.usernameLbl.AutoSize = true; usernameLbl.AutoSize = true;
this.usernameLbl.Location = new System.Drawing.Point(14, 25); usernameLbl.Location = new System.Drawing.Point(14, 25);
this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.usernameLbl.Name = "usernameLbl"; usernameLbl.Name = "usernameLbl";
this.usernameLbl.Size = new System.Drawing.Size(80, 15); usernameLbl.Size = new System.Drawing.Size(80, 15);
this.usernameLbl.TabIndex = 1; usernameLbl.TabIndex = 1;
this.usernameLbl.Text = "Username: {0}"; usernameLbl.Text = "Username: {0}";
// //
// externalLoginLink // externalLoginLink
// //
this.externalLoginLink.AutoSize = true; externalLoginLink.AutoSize = true;
this.externalLoginLink.Location = new System.Drawing.Point(14, 93); externalLoginLink.Location = new System.Drawing.Point(14, 93);
this.externalLoginLink.Name = "externalLoginLink"; externalLoginLink.Name = "externalLoginLink";
this.externalLoginLink.Size = new System.Drawing.Size(107, 15); externalLoginLink.Size = new System.Drawing.Size(166, 15);
this.externalLoginLink.TabIndex = 4; externalLoginLink.TabIndex = 4;
this.externalLoginLink.TabStop = true; externalLoginLink.TabStop = true;
this.externalLoginLink.Text = "Or click here to log"; externalLoginLink.Text = "Trouble Logging in? Click here";
this.externalLoginLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.externalLoginLink_LinkClicked); externalLoginLink.LinkClicked += externalLoginLink_LinkClicked;
// //
// externalLoginLbl2 // externalLoginLbl2
// //
this.externalLoginLbl2.AutoSize = true; externalLoginLbl2.AutoSize = true;
this.externalLoginLbl2.Location = new System.Drawing.Point(14, 108); externalLoginLbl2.Location = new System.Drawing.Point(14, 108);
this.externalLoginLbl2.Name = "externalLoginLbl2"; externalLoginLbl2.Name = "externalLoginLbl2";
this.externalLoginLbl2.Size = new System.Drawing.Size(352, 45); externalLoginLbl2.Size = new System.Drawing.Size(352, 45);
this.externalLoginLbl2.TabIndex = 6; externalLoginLbl2.TabIndex = 6;
this.externalLoginLbl2.Text = "This more advanced login is recommended if you\'re experiencing\r\nerrors logging in" + externalLoginLbl2.Text = "This more advanced login is recommended if you're experiencing\r\nerrors logging in the conventional way above or if you're not\r\ncomfortable typing your password here.";
" the conventional way above or if you\'re not\r\ncomfortable typing your password h" +
"ere.";
// //
// externalLoginLbl1 // externalLoginLbl1
// //
this.externalLoginLbl1.AutoSize = true; externalLoginLbl1.AutoSize = true;
this.externalLoginLbl1.Location = new System.Drawing.Point(83, 93); externalLoginLbl1.Location = new System.Drawing.Point(177, 93);
this.externalLoginLbl1.Name = "externalLoginLbl1"; externalLoginLbl1.Name = "externalLoginLbl1";
this.externalLoginLbl1.Size = new System.Drawing.Size(158, 15); externalLoginLbl1.Size = new System.Drawing.Size(158, 15);
this.externalLoginLbl1.TabIndex = 5; externalLoginLbl1.TabIndex = 5;
this.externalLoginLbl1.Text = "to log in using your browser."; externalLoginLbl1.Text = "to log in using your browser.";
// //
// LoginChoiceEagerDialog // LoginChoiceEagerDialog
// //
this.AcceptButton = this.submitBtn; AcceptButton = submitBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(394, 216); ClientSize = new System.Drawing.Size(394, 216);
this.Controls.Add(this.externalLoginLbl2); Controls.Add(externalLoginLbl2);
this.Controls.Add(this.externalLoginLbl1); Controls.Add(externalLoginLbl1);
this.Controls.Add(this.externalLoginLink); Controls.Add(externalLoginLink);
this.Controls.Add(this.usernameLbl); Controls.Add(usernameLbl);
this.Controls.Add(this.localeLbl); Controls.Add(localeLbl);
this.Controls.Add(this.submitBtn); Controls.Add(submitBtn);
this.Controls.Add(this.passwordLbl); Controls.Add(passwordLbl);
this.Controls.Add(this.passwordTb); Controls.Add(passwordTb);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.MaximizeBox = false; MaximizeBox = false;
this.MinimizeBox = false; MinimizeBox = false;
this.Name = "LoginChoiceEagerDialog"; Name = "LoginChoiceEagerDialog";
this.ShowIcon = false; ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Audible Login"; Text = "Audible Login";
this.ResumeLayout(false); ResumeLayout(false);
this.PerformLayout(); PerformLayout();
} }
#endregion #endregion