phantomix
/
dmdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2021-06-25PX Attachments basically work for MV

This commit is contained in:
phantomix 2021-06-25 23:33:05 +02:00
parent 44922db6f7
commit 69c7783c9f
8 changed files with 122 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dezentrale-members.csproj
View File

@ -202,13 +202,14 @@
<Compile Include="model\svg\SvgFile.cs" />
<Compile Include="model\svg\SvgPath.cs" />
<Compile Include="model\MvList.cs" />
<Compile Include="model\Blob.cs" />
<Compile Include="model\Attachment.cs" />
<Compile Include="view\LvMv.cs" />
<Compile Include="view\FormWithActionButtons.cs" />
<Compile Include="view\LvMvInvitations.cs" />
<Compile Include="model\XmlLog.cs" />
<Compile Include="core\MvFinishProcess.cs" />
<Compile Include="view\LvAttachments.cs" />
<Compile Include="model\IAttachmentOwner.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />

47
model/Blob.cs → model/Attachment.cs
View File

@ -6,25 +6,29 @@ using ICSharpCode.SharpZipLib.Zip;
namespace dezentrale.model
{
public class Blob
public class Attachment
{
[XmlAttribute] public string FileName { get; set; } = "";
[XmlAttribute] public DateTime Added { get; set; } = DateTime.Now;
[XmlAttribute] public DateTime Modified { get; set; }
[XmlAttribute] public int Size { get; set; } = 0;
[XmlAttribute] public string FileName { get; set; } = "";
[XmlAttribute] public DateTime Added { get; set; } = DateTime.Now;
[XmlAttribute] public DateTime Modified { get; set; }
[XmlAttribute] public int Size { get; set; } = 0;
[XmlAttribute] public string DataFileName { get; set; } = null;
[XmlIgnore] public string CompletePath
{ get {
return System.IO.Path.Combine(Program.config.DbDirectory, DataFileName);
} }
[XmlIgnore]
public string CompletePath
{
get
{
return System.IO.Path.Combine(Program.config.DbDirectory, DataFileName);
}
}
public Blob() : base() { }
public Blob(string fileName) : base()
public Attachment() : base() { }
public Attachment(string fileName) : base()
{
Added = DateTime.Now;
FileName = fileName;
}
public Blob(string fileName, byte[] contents) : base()
public Attachment(string fileName, byte[] contents) : base()
{
Added = DateTime.Now;
FileName = fileName;
@ -43,13 +47,14 @@ namespace dezentrale.model
Console.WriteLine(theEntry.Name);
string fileName = Path.GetFileName(theEntry.Name);
if(fileName == FileName)
if (fileName == FileName)
{
long size = theEntry.Size;
if (size != this.Size) throw new Exception($"Size in file {DataFileName} ({FileName}) differs from expected.");
byte[] contents = new byte[size];
size = s.Read(contents, 0, size);
if(size != Size) throw new Exception($"Size in file {DataFileName} ({FileName}) differs from expected.");
size = s.Read(contents, 0, (int)size);
if (size != Size) throw new Exception($"Size in file {DataFileName} ({FileName}) differs from expected.");
return contents;
}
}
}
@ -60,7 +65,7 @@ namespace dezentrale.model
public void SetContents(byte[] contents, bool deleteOldContentFile = true)
{
Modified = DateTime.Now;
if (DataFileName != null)
if (!string.IsNullOrEmpty(DataFileName))
{
//Delete old contents
try
@ -69,26 +74,26 @@ namespace dezentrale.model
Console.WriteLine($"Old content file {DataFileName} deleted.");
DataFileName = null;
Size = 0;
} catch(Exception ex)
}
catch (Exception ex)
{
Console.WriteLine($"Cannot delete file {DataFileName}:");
Console.WriteLine(ex.Message);
}
} else
}
else
{
Console.WriteLine($"Old content file {DataFileName} kept. This is an orphan now.");
}
if (contents != null)
{
//store into file
string completePath = "";
do
{
DataFileName = $"{Guid.NewGuid().ToString()}.zip";
} while (File.Exists(CompletePath)); //should never happen but we're checking to be sure.
string completePath = System.IO.Path.Combine(Program.config.DbDirectory, DataFileName);
Size = contents.Length;
using (ZipOutputStream s = new ZipOutputStream(File.Create(completePath)))

2
model/FormMail.cs
View File

@ -67,7 +67,7 @@ namespace dezentrale.model
message.Body = src.Body;
if (files != null)
foreach (string f in files)
message.Attachments.Add(new Attachment(f));
message.Attachments.Add(new System.Net.Mail.Attachment(f));
#pragma warning disable CS0618 //Suppress deprecation warning
/* Warning CS0618: 'SmtpClient' is obsolete: 'SmtpClient

24
model/IAttachmentOwner.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
namespace dezentrale.model
{
public enum eAttachmentAction
{
Added = 0,
Deleted = 1,
NameChange = 2,
ContentsChange = 3
}
/** \brief an attachment owner holds a list of attachment metadata objects
* (dezentrale.model.Attachment), and an attachments changed callback
* for notifications that can trigger e.g. a serialization process.
*/
public interface IAttachmentOwner
{
List<Attachment> Attachments { get; set; }
void AttachmentChanged(Attachment attachment, eAttachmentAction action);
}
}

9
model/Mv.cs
View File

@ -43,7 +43,7 @@ namespace dezentrale.model
}
}
public class Mv : XmlLog
public class Mv : XmlLog, IAttachmentOwner
{
public enum MvStatus
{
@ -76,7 +76,7 @@ namespace dezentrale.model
[XmlElement] public List<MvInvitedMember> Members { get; set; } = new List<MvInvitedMember>();
[XmlElement] public string Protocol { get { return protocol; } set { LogPropertyChange("Protocol", protocol, value); protocol = value; } }
[XmlElement] public List<Blob> Attachments { get; set; } = new List<Blob>();
[XmlElement("Attachments")] public List<Attachment> Attachments { get; set; } = new List<Attachment>();
[XmlIgnore] public string AgendaNumberedString
{
@ -203,5 +203,10 @@ namespace dezentrale.model
if(m != null) fm = fm.ReplaceReflect(m);
return fm;
}
public void AttachmentChanged(Attachment attachment, eAttachmentAction action)
{
}
}
}

1
model/XmlLog.cs
View File

@ -25,6 +25,7 @@ namespace dezentrale.model
Log.Add(CurrentLog);
return CurrentLog;
}
protected void LogPropertyChange(string propertyName, object oldValue, object newValue)
{
if (XmlLog.SuppressAllLogging || SuppressLogging) return;

62
view/LvAttachments.cs
View File

@ -7,7 +7,7 @@ using dezentrale.model;
namespace dezentrale.view
{
public class LvAttachments : CustomListView<MvInvitedMember>
public class LvAttachments : CustomListView<Attachment>
{
protected override List<ConfigLVDataHandler> DefaultColumns
{
@ -19,21 +19,73 @@ namespace dezentrale.view
{
Name = "fileName",
Display = "FileName",
Width = 40,
CustomToString = x => ((MvInvitedMember)x).NumberString,
Width = 80,
CustomToString = x => ((Attachment)x).FileName,
},
new ConfigLVDataHandler()
{
Name = "added",
Display = "Added",
Width = 88,
CustomToString = ( x => (((MvInvitedMember)x).InvitationDate.Year > 1 ? ((MvInvitedMember)x).InvitationDate.ToString() : "-") ),
CustomToString = ( x => (((Attachment)x).Added.Year > 1 ? ((Attachment)x).Added.ToString() : "-") ),
},
};
}
}
public LvAttachments() : base(Program.config.AttachmentsColumns, LvAttachments_ColumnsChanged) { }
private IAttachmentOwner owner;
public LvAttachments(IAttachmentOwner owner) : base(Program.config.AttachmentsColumns, LvAttachments_ColumnsChanged)
{
this.owner = owner;
LoadFromList(owner.Attachments);
AddMenuItem("Add file...", (sender, e) =>
{
OpenFileDialog ofd = new OpenFileDialog();
DialogResult dr = ofd.ShowDialog();
if(dr == DialogResult.OK)
{
try
{
byte[] data = System.IO.File.ReadAllBytes(ofd.FileName);
Attachment a = new Attachment(System.IO.Path.GetFileName(ofd.FileName), data);
owner.Attachments.Add(a);
owner.AttachmentChanged(a, eAttachmentAction.Added);
AddEntry(a);
} catch(Exception ex)
{
MessageBox.Show($"Error:\r\n{ex.Message}");
}
}
});
AddMenuItem("Save file as...", (sender, e) =>
{
List<Attachment> save = GetSelectedItems();
if(save.Count < 1)
{
MessageBox.Show("No file selected.");
return;
}
SaveFileDialog sfd = new SaveFileDialog();
sfd.FileName = save[0].FileName;
DialogResult dr = sfd.ShowDialog();
if(dr == DialogResult.OK)
{
try
{
byte[] data = save[0].GetContents();
System.IO.File.WriteAllBytes(sfd.FileName, data);
} catch(Exception ex)
{
MessageBox.Show($"Error:\r\n{ex.Message}");
}
}
});
AddMenuItem("Delete file(s)", (sender, e) =>
{
});
}
private static void LvAttachments_ColumnsChanged(object sender, ColumnsChangedArgs e)
{

5
view/LvMvInvitations.cs
View File

@ -54,7 +54,10 @@ namespace dezentrale.view
}
}
public LvMvInvitations() : base(Program.config.MvInvitationsListColumns, LvMvInvitations_ColumnsChanged) { }
public LvMvInvitations() : base(Program.config.MvInvitationsListColumns, LvMvInvitations_ColumnsChanged)
{
//TODO: add menu entries for adding/removing/editing attachments
}
private static void LvMvInvitations_ColumnsChanged(object sender, ColumnsChangedArgs e)
{