Added .editorconfig.
Changes to .fossil-settings/ignore-glob.
Changes to MailJanitor.csproj.
Changes to MailJanitorContext.cs.
Changes to MailSynchronizer.cs.
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
-
-
-
+
+
-
+
+
+
+
+
+
+
+
-
+
|
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using MailJanitor.Models;
using MailKit;
using MC.Utilities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using MimeKit;
namespace MailJanitor
{
public class MailSynchronizer
{
private readonly CancellationToken _cancellationToken;
private readonly ReverseMarkdown.Config _htmlConverterConfig = new ReverseMarkdown.Config
{
GithubFlavored = true,
RemoveComments = false,
SmartHrefHandling = true,
TableWithoutHeaderRowHandling = ReverseMarkdown.Config.TableWithoutHeaderRowHandlingOption.Default,
UnknownTags = ReverseMarkdown.Config.UnknownTagsOption.Bypass,
};
private Dictionary<(string, bool), long> _keywords;
private Dictionary<string, long> _participants;
private Dictionary<(string, bool), long> _keywords = new Dictionary<(string, bool), long>();
private Dictionary<string, long> _participants = new Dictionary<string, long>();
private int _totalCountAllFolders;
private int _countAllFolders;
private DateTime _startAccount;
private bool _haveDeleted = false;
public MailSynchronizer(CancellationToken cancellationToken)
{
_cancellationToken = cancellationToken;
}
public async Task SynchronizeAccount(string host, short port, NetworkCredential credentials,
Func<IMailFolder,bool> folderFilter = null,
Func<IMailFolder,bool>? folderFilter = null,
bool vacuumDatabase = false)
{
_startAccount = DateTime.UtcNow;
Con.WriteLine($"{_startAccount.ToLocalTime():s} Synchronizing account {host}...", TraceLevel.Verbose);
if (credentials is null)
{
throw new ArgumentNullException(nameof(credentials));
}
Account account;
using (var work = new UnitOfWork(_cancellationToken))
{
account = await work.Accounts.GetOrCreateAsync(host, port, credentials.UserName);
_participants = await work.Participants.GetDictionaryAsync(p => p.Address ?? p.Name, p => p.ID, StringComparer.InvariantCultureIgnoreCase);
_participants = await work.Participants.GetDictionaryAsync(p => p.Address ?? p.Name ?? "", p => p.ID, StringComparer.InvariantCultureIgnoreCase);
_keywords = await work.Keywords.GetDictionaryAsync(kw => (kw.Name, kw.IsLabel), kw => kw.ID, KeywordEqualityComparer.InvariantCultureIgnoreCase);
}
using (var client = new MailKit.Net.Imap.ImapClient())
{
Con.WriteLine("Connecting to server...", TraceLevel.Verbose);
await client.ConnectAsync(host, port, true, _cancellationToken);
|
︙ | | |
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
-
|
// Filter out all unwanted folders
mailFolders = mailFolders.Where(mf => !mf.Attributes.HasFlag(FolderAttributes.NoSelect)
&& !mf.Attributes.HasFlag(FolderAttributes.NonExistent)
&& (folderFilter == null || folderFilter(mf)));
_totalCountAllFolders = mailFolders.Sum(mf => mf.Count);
_countAllFolders = 0;
_startAccount = DateTime.UtcNow;
// Keep track of processed folders, to see if one has been deleted
var remainingFolderIDs = new List<long>();
using (var work = new UnitOfWork(_cancellationToken))
{
remainingFolderIDs.AddRange(work.Folders.Select(f => f.AccountID == account.ID, f => f.ID));
}
|
︙ | | |
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
-
+
-
-
-
-
+
+
+
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
|
}
}
await SynchronizeFolder(mailFolder, dbFolder);
if (mailFolder.UidNext != null)
{
using (var work = new UnitOfWork(_cancellationToken))
using var work = new UnitOfWork(_cancellationToken);
{
dbFolder = await work.Folders.GetByIdAsync(dbFolder.ID);
dbFolder.UIDNext = mailFolder.UidNext.Value.Id;
await work.SaveChangesAsync();
dbFolder = await work.Folders.GetByIdAsync(dbFolder.ID);
dbFolder.UIDNext = mailFolder.UidNext.Value.Id;
await work.SaveChangesAsync();
}
}
} // foreach folder
// If we have remaining folders that aren't on the server anymore, delete them
if (remainingFolderIDs.Any())
{
using (var work = new UnitOfWork(_cancellationToken))
using var work = new UnitOfWork(_cancellationToken);
{
// First verify that they don't have any child folders; otherwise we'd be deleting those too...
remainingFolderIDs = work.Folders.Select(f => remainingFolderIDs.Contains(f.ID) && !f.Children.Any(),
f => f.ID).ToList();
if (remainingFolderIDs.Any())
{
Con.WriteLine("Deleting local folder(s):");
Con.WriteLine("- " + string.Join("\n- ", await work.Folders.GetFullNamesAsync(remainingFolderIDs)));
// First verify that they don't have any child folders; otherwise we'd be deleting those too...
remainingFolderIDs = work.Folders.Select(f => remainingFolderIDs.Contains(f.ID) && !f.Children.Any(),
f => f.ID).ToList();
if (remainingFolderIDs.Any())
{
Con.WriteLine("Deleting local folder(s):");
Con.WriteLine("- " + string.Join("\n- ", await work.Folders.GetFullNamesAsync(remainingFolderIDs)));
work.Folders.DeleteByIDs(remainingFolderIDs);
await work.SaveChangesAsync();
_haveDeleted = true;
work.Folders.DeleteByIDs(remainingFolderIDs);
await work.SaveChangesAsync();
_haveDeleted = true;
}
}
}
}
// clean up free messages and participants
_participants.Clear();
_keywords.Clear();
|
︙ | | |
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
-
+
|
messageIDs = await work.FolderMessages.GetIDsByGlobalIDAsync(dbFolder.ID, globalIDs);
}
int totalCount = summaries.Count, counter = 0;
Con.WriteLine($"\tFetching {totalCount} new and/or updated messages...", TraceLevel.Verbose);
DateTime start = DateTime.UtcNow;
DateTime lastProgressUpdate = DateTime.MinValue;
foreach (var summary in summaries)
foreach (IMessageSummary summary in summaries)
{
counter++;
_countAllFolders++;
long? folderMsgID = null;
long? messageID = null;
if (messageIDs.TryGetValue(summary.GMailMessageId.Value, out var ids))
|
︙ | | |
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
|
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
|
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
|
}
}
}
private async Task SynchronizeMessage(IMessageSummary summary, IMailFolder mailFolder,
long folderID, long? folderMsgID, long? messageID)
{
using (var work = new UnitOfWork(_cancellationToken))
using var work = new UnitOfWork(_cancellationToken);
{
try
{
// Deleted message: don't download it; delete it from the database instead
if (summary.Flags.Value.HasFlag(MessageFlags.Deleted))
{
if (folderMsgID != null)
{
work.FolderMessages.DeleteByID(folderMsgID.Value);
await work.SaveChangesAsync();
_haveDeleted = true;
}
return;
}
try
{
// Deleted message: don't download it; delete it from the database instead
if (summary.Flags.Value.HasFlag(MessageFlags.Deleted))
{
if (folderMsgID != null)
{
work.FolderMessages.DeleteByID(folderMsgID.Value);
await work.SaveChangesAsync();
_haveDeleted = true;
}
return;
}
// Otherwise, check out the existing message
Message dbMessage = null;
if (messageID != null)
{
dbMessage = await work.Messages.GetByIdAsync(messageID.Value);
}
FolderMessage folderMessage = null;
if (folderMsgID == null
&& dbMessage != null
&& summary.Flags == dbMessage.Flags
&& summary.InternalDate == dbMessage.DateReceived
&& string.Join(", ", summary.Keywords) == dbMessage.Keywords)
{
folderMessage = new FolderMessage
{
FolderID = folderID,
UniqueId = summary.UniqueId,
Message = dbMessage,
};
await work.FolderMessages.AddAsync(folderMessage);
}
else if (dbMessage == null
|| summary.Flags != dbMessage.Flags
|| summary.InternalDate != dbMessage.DateReceived
|| string.Join(", ", summary.Keywords) != dbMessage.Keywords)
{
MimeMessage mailMessage = await GetMailMessageAsync(summary, mailFolder);
// save message to database
if (folderMsgID != null)
{
folderMessage = await work.DB.FolderMessages
.Where(fm => fm.ID == folderMsgID)
.Include(fm => fm.Message)
.ThenInclude(m => m.Participants)
.SingleOrDefaultAsync(_cancellationToken);
}
if (folderMessage == null)
{
folderMessage = new FolderMessage
{
FolderID = folderID,
UniqueId = summary.UniqueId,
Message = dbMessage ?? new Message
{
Participants = new List<MessageParticipant>(),
},
};
await work.FolderMessages.AddAsync(folderMessage);
}
dbMessage = folderMessage.Message;
dbMessage.GlobalID = summary.GMailMessageId;
dbMessage.DateRetrievedUTC = DateTime.UtcNow;
dbMessage.Flags = summary.Flags ?? MessageFlags.None;
dbMessage.DateReceived = summary.InternalDate;
await PopulateMessageAsync(dbMessage, mailMessage, summary.Keywords);
// Otherwise, check out the existing message
Message? dbMessage = null;
if (messageID != null)
{
dbMessage = await work.Messages.GetByIdAsync(messageID.Value);
}
FolderMessage? folderMessage = null;
if (folderMsgID == null
&& dbMessage != null
&& summary.Flags == dbMessage.Flags
&& summary.InternalDate == dbMessage.DateReceived
&& string.Join(", ", summary.Keywords) == dbMessage.Keywords)
{
folderMessage = new FolderMessage
{
FolderID = folderID,
UID = summary.UniqueId.Id,
Message = dbMessage,
};
await work.FolderMessages.AddAsync(folderMessage);
}
else if (dbMessage == null
|| summary.Flags != dbMessage.Flags
|| summary.InternalDate != dbMessage.DateReceived
|| string.Join(", ", summary.Keywords) != dbMessage.Keywords)
{
MimeMessage mailMessage = await GetMailMessageAsync(summary, mailFolder);
// save message to database
if (folderMsgID != null)
{
folderMessage = await work.DB.FolderMessages
.Where(fm => fm.ID == folderMsgID)
.Include(fm => fm.Message)
.ThenInclude(m => m.Participants)
.SingleOrDefaultAsync(_cancellationToken);
}
if (folderMessage == null)
{
folderMessage = new FolderMessage
{
FolderID = folderID,
UID = summary.UniqueId.Id,
Message = dbMessage ?? new Message
{
Participants = new List<MessageParticipant>(),
},
};
await work.FolderMessages.AddAsync(folderMessage);
}
dbMessage = folderMessage.Message;
dbMessage.GlobalID = summary.GMailMessageId;
dbMessage.DateRetrievedUTC = DateTime.UtcNow;
dbMessage.Flags = summary.Flags ?? MessageFlags.None;
dbMessage.DateReceived = summary.InternalDate;
await PopulateMessageAsync(dbMessage, mailMessage, summary.Keywords);
// Store all separate entities contained in the mail message
await PopulateParticipantsAsync(work, dbMessage, mailMessage); // from headers
await PopulateKeywordsAsync(work, dbMessage, summary.Keywords, summary.GMailLabels); // from summary
await PopulateReferencesAsync(work, dbMessage, mailMessage); // from summary + headers
// Store all separate entities contained in the mail message
await PopulateParticipantsAsync(work, dbMessage, mailMessage); // from headers
await PopulateKeywordsAsync(work, dbMessage, summary.Keywords, summary.GMailLabels); // from summary
await PopulateReferencesAsync(work, dbMessage, mailMessage); // from summary + headers
}
await work.SaveChangesAsync();
}
catch (Exception ex)
{
if (ex is TaskCanceledException || ex is OperationCanceledException || ex is ServiceNotConnectedException)
{
throw; // those need to fall through
}
await Con.WriteLineAsync();
await Con.WriteLineAsync(ex);
}
await work.SaveChangesAsync();
}
catch (Exception ex)
{
if (ex is TaskCanceledException || ex is OperationCanceledException || ex is ServiceNotConnectedException)
{
throw; // those need to fall through
}
await Con.WriteLineAsync();
await Con.WriteLineAsync(ex);
}
}
}
private async Task<MimeMessage> GetMailMessageAsync(IMessageSummary summary, IMailFolder mailFolder)
{
MimeMessage mailMessage;
try
{
mailMessage = await mailFolder.GetMessageAsync(summary.UniqueId, _cancellationToken);
}
catch (FormatException)
{
var mailEncoding = Encoding.GetEncoding("ISO-8859-1");
// Upon failure to parse the message, try to download the entire message stream
using (Stream mailStream = await mailFolder.GetStreamAsync(summary.UniqueId, 0, (int)summary.Size.Value, _cancellationToken))
using (StreamReader reader = new StreamReader(mailStream, mailEncoding, true))
using Stream mailStream = await mailFolder.GetStreamAsync(summary.UniqueId, 0, (int)summary.Size.Value, _cancellationToken);
using StreamReader reader = new StreamReader(mailStream, mailEncoding, true);
{
using (var fs = new FileStream($"{summary.GMailMessageId}.eml", FileMode.Create, FileAccess.ReadWrite, FileShare.Read))
{
await mailStream.CopyToAsync(fs, _cancellationToken);
mailStream.Position = 0;
}
// Now, attempt to fix the mail message, by skipping lines until one doesn't start with a spacing character
var sbSource = new StringBuilder((int)mailStream.Length);
while (!reader.EndOfStream)
{
string line = await reader.ReadLineAsync();
if (line.Length == 0 || !char.IsWhiteSpace(line[0]))
{
sbSource.Append(line);
sbSource.Append("\r\n");
sbSource.Append(await reader.ReadToEndAsync());
}
}
using (var fixedStream = new MemoryStream((int)mailStream.Length))
using (var fs = new FileStream($"{summary.GMailMessageId}.eml", FileMode.Create, FileAccess.ReadWrite, FileShare.Read))
{
await mailStream.CopyToAsync(fs, _cancellationToken);
mailStream.Position = 0;
}
// Now, attempt to fix the mail message, by skipping lines until one doesn't start with a spacing character
var sbSource = new StringBuilder((int)mailStream.Length);
while (!reader.EndOfStream)
{
string line = await reader.ReadLineAsync() ?? "";
if (line.Length == 0 || !char.IsWhiteSpace(line[0]))
{
sbSource.Append(line);
sbSource.Append("\r\n");
sbSource.Append(await reader.ReadToEndAsync());
}
}
using var fixedStream = new MemoryStream((int)mailStream.Length);
{
await fixedStream.WriteAsync(reader.CurrentEncoding.GetBytes(sbSource.ToString()), _cancellationToken);
fixedStream.Position = 0;
var options = new ParserOptions
{
AddressParserComplianceMode = RfcComplianceMode.Loose,
AllowAddressesWithoutDomain = true,
AllowUnquotedCommasInAddresses = false,
CharsetEncoding = mailEncoding,
MaxAddressGroupDepth = 3,
ParameterComplianceMode = RfcComplianceMode.Loose,
RespectContentLength = true,
Rfc2047ComplianceMode = RfcComplianceMode.Loose,
};
mailMessage = await MimeMessage.LoadAsync(options, fixedStream, _cancellationToken);
await fixedStream.WriteAsync(reader.CurrentEncoding.GetBytes(sbSource.ToString()), _cancellationToken);
fixedStream.Position = 0;
var options = new ParserOptions
{
AddressParserComplianceMode = RfcComplianceMode.Loose,
AllowAddressesWithoutDomain = true,
AllowUnquotedCommasInAddresses = false,
CharsetEncoding = mailEncoding,
MaxAddressGroupDepth = 3,
ParameterComplianceMode = RfcComplianceMode.Loose,
RespectContentLength = true,
Rfc2047ComplianceMode = RfcComplianceMode.Loose,
};
mailMessage = await MimeMessage.LoadAsync(options, fixedStream, _cancellationToken);
}
}
}
return mailMessage;
}
public async Task ClearUnunsedObjectsAsync(bool vacuumDatabase = false)
{
using (var work = new UnitOfWork(_cancellationToken))
using var work = new UnitOfWork(_cancellationToken);
{
await Con.WriteLineAsync("Cleaning up database...", TraceLevel.Verbose);
await Con.WriteLineAsync("Cleaning up database...", TraceLevel.Verbose);
// Delete any messages not linked to a folder
work.Messages.DeleteByIDs(m => !m.Folders.Any(), m => m.ID);
int numDeleted = await work.SaveChangesAsync();
// Delete any messages not linked to a folder
work.Messages.DeleteByIDs(m => !m.Folders.Any(), m => m.ID);
int numDeleted = await work.SaveChangesAsync();
// Delete any participants not linked to a message
work.Participants.DeleteByIDs(p => !p.Messages.Any(), p => p.ID);
numDeleted += await work.SaveChangesAsync();
// Delete any participants not linked to a message
work.Participants.DeleteByIDs(p => !p.Messages.Any(), p => p.ID);
numDeleted += await work.SaveChangesAsync();
if (vacuumDatabase && (_haveDeleted || numDeleted > 0))
{
await work.DB.Database.ExecuteSqlCommandAsync("VACUUM", _cancellationToken);
if (vacuumDatabase && (_haveDeleted || numDeleted > 0))
{
await work.DB.Database.ExecuteSqlRawAsync("VACUUM", _cancellationToken);
}
}
}
private async Task PopulateMessageAsync(Message targetMsg, MimeMessage sourceMsg, IEnumerable<string> keywords)
{
try
{
|
︙ | | |
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
|
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
|
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
+
-
+
-
+
|
// TODO: only do this if we've downloaded more than just the headers
// store text (if present) and ALSO extract text from HTML (if present); they might not contain the same text.
targetMsg.Body = await ExtractBodyText(sourceMsg);
if (sourceMsg.Attachments.Any())
{
targetMsg.AttachmentSummary = string.Join(Environment.NewLine,
targetMsg.AttachmentSummary = string.Join(Environment.NewLine, sourceMsg.Attachments.Select(SummarizeAttachment));
sourceMsg.Attachments.Select((a, i) => $"{i + 1}. {(a is MimePart part ? part.FileName : null)} [{a.ContentType.MimeType}] " + a.Headers[HeaderId.ContentDescription]));
}
else
{
targetMsg.AttachmentSummary = null;
}
using (var zipStream = new MemoryStream())
using var zipStream = new MemoryStream();
{
using (var zip = new ZipArchive(zipStream, ZipArchiveMode.Update))
{
string filename = CreateMessageFilename(sourceMsg);
var entry = zip.CreateEntry(filename, CompressionLevel.Optimal);
try
{
entry.LastWriteTime = sourceMsg.Date;
}
catch
{
// ignore errors; just use today's date instead
}
using (var compressedStream = entry.Open())
await sourceMsg.WriteToAsync(compressedStream);
}
targetMsg.Original = zipStream.ToArray();
using (var zip = new ZipArchive(zipStream, ZipArchiveMode.Update))
{
string filename = CreateMessageFilename(sourceMsg);
var entry = zip.CreateEntry(filename, CompressionLevel.Optimal);
try
{
entry.LastWriteTime = sourceMsg.Date;
}
catch
{
// ignore errors; just use today's date instead
}
using var compressedStream = entry.Open();
await sourceMsg.WriteToAsync(compressedStream);
}
targetMsg.Original = zipStream.ToArray();
}
// TODO: skip the above if we only have the headers
}
catch (Exception ex)
{
if (ex is TaskCanceledException || ex is OperationCanceledException || ex is ServiceNotConnectedException)
{
throw; // those need to fall through
}
await Con.WriteLineAsync();
await Con.WriteLineAsync(ex);
}
} // PopulateMessageAsync
private static string CreateMessageFilename(MimeMessage sourceMsg, string extension = ".eml")
{
string subject = MakeSafe(sourceMsg.Subject);
string? subject = MakeSafe(sourceMsg.Subject);
InternetAddress sender = sourceMsg.From.FirstOrDefault();
string senderName = MakeSafe(sender?.Name ?? sender?.ToString());
string? senderName = MakeSafe(sender?.Name ?? sender?.ToString());
string fileName = $"{subject}{(subject != null && senderName != null ? " - " : "")}{senderName}";
// If there's nothing left, just use a default name
if (fileName.Length <= 3)
return "message" + extension;
else if (fileName.Length > 250)
return MakeSafe(fileName.Substring(0, 250)) + extension;
else
return fileName + extension;
}
private static readonly char[] _forbiddenChars = new char[] { '<', '>', '|', '?', '*', ':', '/', '\\', '"' };
private static readonly UnicodeCategory[] _spacingCategories = new UnicodeCategory[]
{
UnicodeCategory.LineSeparator,
UnicodeCategory.ParagraphSeparator,
UnicodeCategory.SpaceSeparator,
};
private static string MakeSafe(string text)
private static string? MakeSafe(string? text)
{
if (string.IsNullOrWhiteSpace(text))
return null;
// First, trim spaces and strip all diacritics; replace all spacing by a normal space
char[] chars = text.Trim().Normalize(NormalizationForm.FormD)
.Where(c => CharUnicodeInfo.GetUnicodeCategory(c) != UnicodeCategory.NonSpacingMark)
.Select(c => _spacingCategories.Contains(CharUnicodeInfo.GetUnicodeCategory(c)) ? ' ' : c)
.ToArray();
// Then, get rid of all remaining non-ascii characters (will get converted to '?')
var ascii = Encoding.ASCII;
chars = ascii.GetChars(ascii.GetBytes(chars));
// Finally remove all forbidden characters from the file name (including '?')
return new string(chars.Where(c => c >= ' ' && !_forbiddenChars.Contains(c)).ToArray())
.Normalize(NormalizationForm.FormC)
.Trim();
}
private async Task<string> ExtractBodyText(MimeMessage sourceMsg)
private async Task<string?> ExtractBodyText(MimeMessage sourceMsg)
{
string bodyText = sourceMsg.TextBody?.Trim();
string? bodyText = sourceMsg.TextBody?.Trim();
if (sourceMsg.HtmlBody != null)
{
if (bodyText != null)
bodyText += Environment.NewLine + Environment.NewLine;
else
bodyText = "";
var errors = new List<Exception>();
|
︙ | | |
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
|
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
|
-
+
-
+
+
-
-
+
+
|
throw errList.First();
}
else
{
throw new AggregateException(errList);
}
}
bodyText += result.Code.Trim();
bodyText += result.Code?.Trim();
return bodyText;
}
catch (Exception ex)
{
errors.Add(ex);
}
try
{
var html = sourceMsg.HtmlBody;
// This HtmlConverter is known to sometimes get stuck in an infinite loop, so wait for a finite amount of time
using(var timeoutTokenSource = new CancellationTokenSource())
{
var task = Task.Run(() => new ReverseMarkdown.Converter(_htmlConverterConfig).Convert(html).TrimEnd(), timeoutTokenSource.Token);
Task<string?> task = Task.Run(() => new ReverseMarkdown.Converter(_htmlConverterConfig).Convert(html)?.TrimEnd(), timeoutTokenSource.Token);
if (task.Wait(300000))
{
task.Dispose();
}
else
{
timeoutTokenSource.Cancel();
// Save the HTML to a temp file, so we can figure out why conversion takes so long
string tempFileName = MakeSafe(sourceMsg.MessageId) + '_' + CreateMessageFilename(sourceMsg, ".html");
using (var fs = new FileStream(tempFileName, FileMode.Create, FileAccess.ReadWrite, FileShare.Read))
using (var writer = new StreamWriter(fs, Encoding.UTF8))
await writer.WriteAsync(sourceMsg.HtmlBody);
File.SetLastWriteTimeUtc(tempFileName, sourceMsg.Date.UtcDateTime);
// TODO: remove above temp file saving
_ = task.ConfigureAwait(false);
task = task.ContinueWith((completedTask, data) => {
if (data is null) throw new ArgumentNullException(nameof(data));
var (gaveupAt, newFileName) = ((DateTime, string))data;
Con.WriteLineErr($"\nHTML conversion finished, but at {DateTime.Now:HH:mm:ss}; we stopped waiting at {gaveupAt:HH:mm:ss}.", ConsoleColor.Cyan);
var markDown = completedTask.Result;
using (var writer = new StreamWriter(newFileName, false, Encoding.UTF8))
writer.Write(markDown);
return (string)null;
}, (DateTime.Now, Path.ChangeExtension(tempFileName, ".md")));
return (string?)null;
}, (DateTime.Now, Path.ChangeExtension(tempFileName, ".md")), TaskScheduler.Current);
throw new TimeoutException("Timeout while converting HTML to markdown.");
}
bodyText += task.Result;
}
return bodyText;
}
catch (Exception ex)
|
︙ | | |
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
|
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
|
await Con.WriteLineAsync();
await Con.WriteLineAsync(ex);
//await Con.WriteLineAsync(sourceMsg.HtmlBody?.Trim(), ConsoleColor.DarkYellow);
}
}
return bodyText;
}
private string SummarizeAttachment(MimeEntity attachment, int index)
{
string? fileName = attachment is MimePart part ? part.FileName : null;
string? size = long.TryParse(attachment.Headers[HeaderId.ContentLength], out long length) ? "; " + FormatSize(length) : null;
string? description = attachment.Headers[HeaderId.ContentDescription];
if (description == fileName) description = "";
return $"{index + 1}. {fileName} [{attachment.ContentType.MimeType}{size}] {description}".TrimEnd();
}
private static readonly List<(string Prefix, long Multiplier)> _siMultipliers = " kMGTPEZY".Select((prefix, index) => (prefix.ToString().Trim(), (long)Math.Pow(10, index))).ToList();
private string FormatSize(long bytes, int decimals = 1)
{
var (prefix, multiplier) = _siMultipliers.LastOrDefault(x => bytes < x.Multiplier);
if (multiplier == 0)
{
(prefix, multiplier) = _siMultipliers.Last();
}
if (multiplier > 1 && decimals > 0)
return string.Format("#,##0." + new string('0', decimals), bytes / multiplier) + ' ' + prefix + 'B';
else
return $"{bytes / multiplier:#,##0} {prefix}B";
}
private static readonly List<(string Prefix, long Multiplier)> _biMultipliers = "_KMGTPEZY".Select((prefix, index) => (Prefix: prefix.ToString().Trim(), (long)Math.Pow(2, Math.Pow(10, index))))
.Select(x => x.Prefix == "_" ? ("", 1) : x).ToList();
private string FormatSizeBinary(long bytes)
{
var (prefix, multiplier) = _biMultipliers.LastOrDefault(x => bytes < x.Multiplier);
if (multiplier == 0)
{
(prefix, multiplier) = _biMultipliers.Last();
}
return $"{bytes / multiplier:#,##0} {prefix}iB";
}
private async Task PopulateParticipantsAsync(UnitOfWork work, Message targetMsg, MimeMessage sourceMsg)
{
try
{
var participantList = new List<(ParticipantField Field, string Address, string Name)>();
var participantList = new List<(ParticipantField Field, string? Address, string Name)>();
GatherParticipants(ref participantList, sourceMsg.From, ParticipantField.From);
GatherParticipants(ref participantList, sourceMsg.To, ParticipantField.To);
GatherParticipants(ref participantList, sourceMsg.Cc, ParticipantField.Cc);
GatherParticipants(ref participantList, sourceMsg.Bcc, ParticipantField.Bcc);
GatherParticipants(ref participantList, sourceMsg.ReplyTo, ParticipantField.ReplyTo);
GatherParticipants(ref participantList, sourceMsg.Sender, ParticipantField.Sender);
GatherParticipants(ref participantList, sourceMsg.ResentFrom, ParticipantField.ResentFrom);
GatherParticipants(ref participantList, sourceMsg.ResentTo, ParticipantField.ResentTo);
GatherParticipants(ref participantList, sourceMsg.ResentCc, ParticipantField.ResentCc);
GatherParticipants(ref participantList, sourceMsg.ResentBcc, ParticipantField.ResentBcc);
GatherParticipants(ref participantList, sourceMsg.ResentReplyTo, ParticipantField.ResentReplyTo);
GatherParticipants(ref participantList, sourceMsg.ResentSender, ParticipantField.ResentSender);
int order = 0;
foreach (var (field, mailAddress, mailName) in participantList)
{
string address = mailAddress == "" ? null : mailAddress;
string name = mailName == "" ? null : mailName;
string? address = mailAddress == "" ? null : mailAddress;
string? name = mailName == "" ? null : mailName;
if (name != null && name.Trim(' ', '\'', '"', '<', '>', '(', ')') == address)
name = null;
var msgParticipant = new MessageParticipant
{
Message = targetMsg,
Field = field,
Order = ++order,
Name = name,
};
var key = address ?? name;
string key = address ?? name ?? "";
if (_participants.TryGetValue(key, out long participantID))
{
msgParticipant.ParticipantID = participantID;
/* TODO: when cleaning up the database? Put the most used name for this address in the participant.
UPDATE Participants p
SET Name = (SELECT mp.Name
FROM MessageParticipants mp
|
︙ | | |
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
|
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
|
-
+
-
|
IEnumerable<string> keywords, IEnumerable<string> labels)
{
try
{
// Store the keywords separately, and link them to this message
var allKeywords = keywords.Select(k => (Name: k, IsLabel: false))
.Concat(labels.Select(l => (Name: l, IsLabel: true)));
var triplets = allKeywords.Select(mailKeyword => (Name: mailKeyword.Name,
var triplets = allKeywords.Select(mailKeyword => (mailKeyword.Name, mailKeyword.IsLabel,
IsLabel: mailKeyword.IsLabel,
ID: _keywords.GetValueOrDefault(mailKeyword, 0)));
var keywordSets = from triplet in triplets
join dbMsgKeyword in work.DB.MessageKeywords.Where(mk => mk.Message == targetMsg)
on triplet.ID equals dbMsgKeyword.KeywordID
into msgKeywordSet
from dbMsgKeyword in msgKeywordSet.DefaultIfEmpty()
select (triplet.Name,
|
︙ | | |
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
|
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
|
-
+
-
+
-
+
|
/// <summary>
/// Store any references between messages.
/// </summary>
/// <param name="work">The <see cref="UnitOfWork"/> to use when storing the references.</param>
/// <param name="targetMsg">The (newly stored) <see cref="Message"/> that should link to the references.</param>
/// <param name="sourceMsg">The <see cref="MimeMessage"/> containing the references.</param>
private async Task PopulateReferencesAsync(UnitOfWork work, Message targetMsg, MimeMessage sourceMsg)
private static async Task PopulateReferencesAsync(UnitOfWork work, Message targetMsg, MimeMessage sourceMsg)
{
try
{
// Include the In-Reply-To header in the list of references
var sourceReferences = new List<string>(sourceMsg.References);
if (!string.IsNullOrWhiteSpace(sourceMsg.InReplyTo) && !sourceReferences.Contains(sourceMsg.InReplyTo))
sourceReferences.Insert(0, sourceMsg.InReplyTo);
var dbMessageRefs = await work.MessageReferences
.GetDictionaryAsync(mr => mr.Message == targetMsg,
mr => mr.ReferencedRfcMessageID,
mr => mr);
var dbReferencedMessageIDs = work.Messages
.GetLookup(m => sourceReferences.Contains(m.RfcMessageID),
.GetLookup(m => sourceReferences.Contains(m.RfcMessageID ?? ""),
m => m.RfcMessageID,
m => m?.ID); // make this a nullable long, so FirstOrDefault will return a null.
int index = 0;
foreach (string mailRef in sourceReferences)
{
index++;
MessageReference dbReference = dbMessageRefs.GetValueOrDefault(mailRef, null);
MessageReference? dbReference = dbMessageRefs.GetValueOrDefault(mailRef, null);
long? dbMessageID = null;
if (dbReferencedMessageIDs.Contains(mailRef))
{
dbMessageID = dbReferencedMessageIDs[mailRef].FirstOrDefault(id => id.HasValue);
}
if (dbReference == null)
{
|
︙ | | |
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
|
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
|
-
+
-
+
-
+
-
-
+
-
+
|
throw; // those need to fall through
}
await Con.WriteLineAsync();
await Con.WriteLineAsync(ex);
}
} // PopulateReferencesAsync
private static void GatherParticipants(ref List<(ParticipantField Field, string Address, string Name)> participantList, InternetAddress ia, ParticipantField field)
private static void GatherParticipants(ref List<(ParticipantField Field, string? Address, string Name)> participantList, InternetAddress ia, ParticipantField field)
{
if (ia == null) return;
var list = new InternetAddressList(new InternetAddress[] { ia });
GatherParticipants(ref participantList, list, field);
}
private static void GatherParticipants(ref List<(ParticipantField Field, string Address, string Name)> participantList, InternetAddressList list, ParticipantField field)
private static void GatherParticipants(ref List<(ParticipantField Field, string? Address, string Name)> participantList, InternetAddressList list, ParticipantField field)
{
foreach (var ia in list)
{
if (ia is GroupAddress group)
{
if (group.Members.Count > 0)
{
participantList.AddRange(group.Members
.Select(ma => ma as MailboxAddress)
.Select(ma => (field, ma.Address, ma.Name)));
.Select(ma => (field, ma?.Address, ma?.Name ?? "")));
}
else
{
participantList.Add((field, null, group.Name));
}
}
else if (ia is MailboxAddress mailbox)
{
participantList.Add((field, mailbox.Address, mailbox.Name));
}
else
{
participantList.Add((field, null, ia.Name));
}
}
}
private class KeywordEqualityComparer : IEqualityComparer<(string Name, bool IsLabel)>
{
private static readonly KeywordEqualityComparer _default = new KeywordEqualityComparer();
public static KeywordEqualityComparer InvariantCultureIgnoreCase { get => _default; }
public static KeywordEqualityComparer InvariantCultureIgnoreCase { get; } = new KeywordEqualityComparer();
public bool Equals((string Name, bool IsLabel) x, (string Name, bool IsLabel) y)
{
return x.IsLabel == y.IsLabel
&& x.Name.Equals(y.Name, StringComparison.InvariantCultureIgnoreCase);
}
public int GetHashCode((string Name, bool IsLabel) obj)
{
return obj.Name.GetHashCode() ^ obj.IsLabel.GetHashCode();
return obj.Name.GetHashCode(StringComparison.InvariantCultureIgnoreCase) ^ obj.IsLabel.GetHashCode();
}
}
}
}
|
Changes to Models/Account.cs.
Changes to Models/Folder.cs.
Changes to Models/FolderMessage.cs.
Changes to Models/Keyword.cs.
Changes to Models/Message.cs.
Changes to Models/MessageKeyword.cs.
Changes to Models/MessageParticipant.cs.
Changes to Models/MessageReference.cs.
Changes to Models/Participant.cs.
Changes to Options.cs.
Changes to Program.cs.
Changes to Repositories/AccountsRepository.cs.
Changes to Repositories/FolderMessagesRepository.cs.
Changes to Repositories/FoldersRepository.cs.
Changes to Repositories/KeywordsRepository.cs.
Changes to Repositories/MessageReferencesRepository.cs.
Changes to Repositories/MessagesRepository.cs.
Changes to Repositories/ParticipantsRepository.cs.
Changes to Repositories/Repository.cs.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
+
-
+
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
|
using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
namespace MailJanitor.Repositories
{
public abstract class Repository<T> where T : class
{
protected readonly MailJanitorContext _db;
protected readonly DbSet<T> _set;
protected readonly CancellationToken _cancellationToken;
public Repository(MailJanitorContext db, CancellationToken cancellationToken)
internal Repository(MailJanitorContext db, CancellationToken cancellationToken)
{
_db = db;
_db = db ?? throw new ArgumentNullException(nameof(db));
_set = _db.Set<T>();
_cancellationToken = cancellationToken;
}
public Task<T> GetByIdAsync(long id)
{
return _set.FindAsync(new object[] { id }, _cancellationToken);
return _set.FindAsync(new object[] { id }, _cancellationToken).AsTask();
}
public Task<T> SingleOrDefaultAsync(Expression<Func<T, bool>> where)
{
return _set.SingleOrDefaultAsync(where, _cancellationToken);
}
public IEnumerable<T> GetList(Expression<Func<T,bool>> where = null)
public IEnumerable<T> GetList(Expression<Func<T, bool>>? where = null)
{
IQueryable<T> result = _set;
if (where != null)
result = result.Where(where);
return result.AsEnumerable();
}
public IEnumerable<T> GetList<TKey>(Expression<Func<T, bool>> where,
Expression<Func<T, TKey>> orderBy,
IComparer<TKey> keyComparer = null)
IComparer<TKey>? keyComparer = null)
{
return _set
.Where(where)
.OrderBy(orderBy, keyComparer ?? Comparer<TKey>.Default)
.AsEnumerable();
}
public Task<Dictionary<TKey, T>> GetDictionaryAsync<TKey>(Func<T, TKey> keySelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
where TKey: notnull
{
return GetDictionaryAsync((Expression<Func<T, bool>>)null, keySelector, keyComparer);
return GetDictionaryAsync((Expression<Func<T, bool>>?)null, keySelector, keyComparer);
}
public Task<Dictionary<TKey, T>> GetDictionaryAsync<TKey>(Expression<Func<T, bool>> where,
public Task<Dictionary<TKey, T>> GetDictionaryAsync<TKey>(Expression<Func<T, bool>>? where,
Func<T, TKey> keySelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
where TKey : notnull
{
IQueryable<T> result = _set;
if (where != null)
result = result.Where(where);
return result.ToDictionaryAsync(keySelector,
keyComparer ?? EqualityComparer<TKey>.Default,
_cancellationToken);
}
public Task<Dictionary<TKey,TValue>> GetDictionaryAsync<TKey, TValue>(Func<T, TKey> keySelector,
Func<T, TValue> valueSelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
where TKey : notnull
{
return GetDictionaryAsync(null, keySelector, valueSelector, keyComparer);
}
public Task<Dictionary<TKey,TValue>> GetDictionaryAsync<TKey, TValue>(Expression<Func<T, bool>> where,
public Task<Dictionary<TKey,TValue>> GetDictionaryAsync<TKey, TValue>(Expression<Func<T, bool>>? where,
Func<T, TKey> keySelector,
Func<T, TValue> valueSelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
where TKey : notnull
{
IQueryable<T> result = _set;
if (where != null)
result = result.Where(where);
return result.ToDictionaryAsync<T, TKey, TValue>(keySelector,
valueSelector,
keyComparer ?? EqualityComparer<TKey>.Default,
_cancellationToken);
return result.ToDictionaryAsync(keySelector,
valueSelector,
keyComparer ?? EqualityComparer<TKey>.Default,
_cancellationToken);
}
public ILookup<TKey, T> GetLookup<TKey>(Func<T, TKey> keySelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
{
return GetLookup((Expression<Func<T, bool>>)null, keySelector, keyComparer);
return GetLookup((Expression<Func<T, bool>>?)null, keySelector, keyComparer);
}
public ILookup<TKey, T> GetLookup<TKey>(Expression<Func<T, bool>> where,
public ILookup<TKey, T> GetLookup<TKey>(Expression<Func<T, bool>>? where,
Func<T, TKey> keySelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
{
IQueryable<T> result = _set;
if (where != null)
result = result.Where(where);
return result.ToLookup(keySelector,
keyComparer ?? EqualityComparer<TKey>.Default);
}
public ILookup<TKey, TValue> GetLookup<TKey, TValue>(Func<T, TKey> keySelector,
Func<T, TValue> valueSelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
{
return GetLookup(null, keySelector, valueSelector, keyComparer);
}
public ILookup<TKey, TValue> GetLookup<TKey, TValue>(Expression<Func<T, bool>> where,
public ILookup<TKey, TValue> GetLookup<TKey, TValue>(Expression<Func<T, bool>>? where,
Func<T, TKey> keySelector,
Func<T, TValue> valueSelector,
IEqualityComparer<TKey> keyComparer = null)
IEqualityComparer<TKey>? keyComparer = null)
{
IQueryable<T> result = _set;
if (where != null)
result = result.Where(where);
return result.ToLookup(keySelector,
valueSelector,
keyComparer ?? EqualityComparer<TKey>.Default);
}
public IEnumerable<TResult> Select<TResult>(Expression<Func<T, bool>> where,
Expression<Func<T, TResult>> valueExpression,
Expression<Func<TResult, bool>> valueFilter = null,
IComparer<TResult> valueSorter = null)
Expression<Func<TResult, bool>>? valueFilter = null,
IComparer<TResult>? valueSorter = null)
{
return Select(valueExpression, where, valueFilter, valueSorter);
}
public IEnumerable<TResult> Select<TResult>(Expression<Func<T, TResult>> valueExpression,
Expression<Func<T, bool>> entityFilter = null,
Expression<Func<TResult, bool>> valueFilter = null,
IComparer<TResult> valueSorter = null)
Expression<Func<T, bool>>? entityFilter = null,
Expression<Func<TResult, bool>>? valueFilter = null,
IComparer<TResult>? valueSorter = null)
{
IQueryable<T> list = _set;
if (entityFilter != null)
list = list.Where(entityFilter);
IQueryable<TResult> result = list.Select(valueExpression);
if (valueFilter != null)
result = result.Where(valueFilter);
|
︙ | | |
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
+
+
+
+
+
|
public void Update(params T[] entities)
{
Update((IEnumerable<T>)entities);
}
public void Update(IEnumerable<T> entities)
{
if (entities is null)
{
throw new ArgumentNullException(nameof(entities));
}
foreach (T entity in entities)
{
_db.Entry(entity).State = EntityState.Modified;
}
}
public void Delete(Expression<Func<T, bool>> predicate)
|
︙ | | |
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
-
+
-
+
-
-
+
+
-
+
|
public int DeleteByIDs<TKey>(Expression<Func<T, bool>> predicate, Expression<Func<T, TKey>> idSelector)
{
IEnumerable<TKey> ids = _set.Where(predicate).Select(idSelector).AsEnumerable();
return DeleteByIDs(ids);
}
public int DeleteByID<TKey>(params TKey[] ids)
{
return DeleteByIDs((IEnumerable<TKey>)ids);
return DeleteByIDs(ids);
}
public virtual int DeleteByIDs<TKey>(IEnumerable<TKey> ids)
{
if (typeof(long).IsAssignableFrom(typeof(TKey)))
{
IEntityType entityType = _db.Model.FindEntityType(typeof(T));
IReadOnlyList<IProperty> keyProperties = entityType.FindPrimaryKey().Properties;
if (keyProperties.Count == 1)
{
IProperty key = keyProperties[0];
if (typeof(long).IsAssignableFrom(key.ClrType))
{
// Ensure we've got Int64s, and nothing else
var numericIDs = ids.Select(id => Convert.ToInt64(id));
var numericIDs = ids.Select(id => Convert.ToInt64(id, CultureInfo.InvariantCulture));
// Prepare the SQL statement
string tableName = entityType.Relational().TableName;
string keyColumn = key.Relational().ColumnName;
string tableName = entityType.GetTableName();
string keyColumn = key.GetColumnName();
string sql = $"DELETE FROM [{tableName}] WHERE [{keyColumn}] IN ({string.Join(", ", numericIDs)})";
#pragma warning disable EF1000 // SQL command has been checked for SQL injection vectors, and found safe.
int numDeleted = _db.Database.ExecuteSqlCommand(sql);
int numDeleted = _db.Database.ExecuteSqlRaw(sql);
#pragma warning restore EF1000
// Detach all corresponding entries
var entries = _db.ChangeTracker.Entries()
.Where(e => e.Metadata == entityType)
.Where(e => ids.Contains((TKey)e.Property(key.Name).CurrentValue));
foreach (var entry in entries)
|
︙ | | |
Changes to UnitOfWork.cs.
Changes to Utilities/ConsoleExtensions.cs.
Changes to mailjanitor.code-workspace.