Skip to content

Commit

Permalink
Refactored ImapFolder's Get/SetMetadata methods to split sync/async
Browse files Browse the repository at this point in the history 
Part of an ongoing effort to fix issue #1335
  • Loading branch information
@jstedfast
jstedfast committed Dec 26, 2023
1 parent 8494602 commit c32a2a0
Showing 1 changed file with 64 additions and 18 deletions.
82 changes: 64 additions & 18 deletions MailKit/Net/Imap/ImapFolder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3168,7 +3168,7 @@ public override async Task RemoveAccessAsync (string name, CancellationToken can
ProcessRemoveAccessResponse (ic);
}

async Task<string> GetMetadataAsync (MetadataTag tag, bool doAsync, CancellationToken cancellationToken)
ImapCommand QueueGetMetadata (MetadataTag tag, CancellationToken cancellationToken)
{
CheckState (false, false);

Expand All @@ -3182,13 +3182,17 @@ async Task<string> GetMetadataAsync (MetadataTag tag, bool doAsync, Cancellation

Engine.QueueCommand (ic);

await Engine.RunAsync (ic, doAsync).ConfigureAwait (false);
return ic;
}

string ProcessGetMetadataResponse (ImapCommand ic, MetadataTag tag)
{
var metadata = (MetadataCollection) ic.UserData;

ProcessResponseCodes (ic, null);

if (ic.Response != ImapCommandResponse.Ok)
throw ImapCommandException.Create ("GETMETADATA", ic);

string value = null;

for (int i = 0; i < metadata.Count; i++) {
Expand Down Expand Up @@ -3239,7 +3243,11 @@ async Task<string> GetMetadataAsync (MetadataTag tag, bool doAsync, Cancellation
/// </exception>
public override string GetMetadata (MetadataTag tag, CancellationToken cancellationToken = default)
{
return GetMetadataAsync (tag, false, cancellationToken).GetAwaiter ().GetResult ();
var ic = QueueGetMetadata (tag, cancellationToken);

Engine.Run (ic);

return ProcessGetMetadataResponse (ic, tag);
}

/// <summary>
Expand Down Expand Up @@ -3275,12 +3283,16 @@ public override string GetMetadata (MetadataTag tag, CancellationToken cancellat
/// <exception cref="ImapCommandException">
/// The server replied with a NO or BAD response.
/// </exception>
public override Task<string> GetMetadataAsync (MetadataTag tag, CancellationToken cancellationToken = default)
public override async Task<string> GetMetadataAsync (MetadataTag tag, CancellationToken cancellationToken = default)
{
return GetMetadataAsync (tag, true, cancellationToken);
var ic = QueueGetMetadata (tag, cancellationToken);

await Engine.RunAsync (ic).ConfigureAwait (false);

return ProcessGetMetadataResponse (ic, tag);
}

async Task<MetadataCollection> GetMetadataAsync (MetadataOptions options, IEnumerable<MetadataTag> tags, bool doAsync, CancellationToken cancellationToken)
ImapCommand QueueGetMetadata (MetadataOptions options, IEnumerable<MetadataTag> tags, CancellationToken cancellationToken)
{
if (options == null)
throw new ArgumentNullException (nameof (options));
Expand Down Expand Up @@ -3330,7 +3342,7 @@ async Task<MetadataCollection> GetMetadataAsync (MetadataOptions options, IEnume
command.Append ("\r\n");

if (args.Count == 1)
return new MetadataCollection ();
return null;

var ic = new ImapCommand (Engine, cancellationToken, null, command.ToString (), args.ToArray ());
ic.RegisterUntaggedHandler ("METADATA", ImapUtils.UntaggedMetadataHandler);
Expand All @@ -3339,8 +3351,11 @@ async Task<MetadataCollection> GetMetadataAsync (MetadataOptions options, IEnume

Engine.QueueCommand (ic);

await Engine.RunAsync (ic, doAsync).ConfigureAwait (false);
return ic;
}

MetadataCollection ProcessGetMetadataResponse (ImapCommand ic, MetadataOptions options)
{
ProcessResponseCodes (ic, null);

if (ic.Response != ImapCommandResponse.Ok)
Expand Down Expand Up @@ -3394,7 +3409,14 @@ async Task<MetadataCollection> GetMetadataAsync (MetadataOptions options, IEnume
/// </exception>
public override MetadataCollection GetMetadata (MetadataOptions options, IEnumerable<MetadataTag> tags, CancellationToken cancellationToken = default)
{
return GetMetadataAsync (options, tags, false, cancellationToken).GetAwaiter ().GetResult ();
var ic = QueueGetMetadata (options, tags, cancellationToken);

if (ic == null)
return new MetadataCollection ();

Engine.Run (ic);

return ProcessGetMetadataResponse (ic, options);
}

/// <summary>
Expand Down Expand Up @@ -3436,12 +3458,19 @@ public override MetadataCollection GetMetadata (MetadataOptions options, IEnumer
/// <exception cref="ImapCommandException">
/// The server replied with a NO or BAD response.
/// </exception>
public override Task<MetadataCollection> GetMetadataAsync (MetadataOptions options, IEnumerable<MetadataTag> tags, CancellationToken cancellationToken = default)
public override async Task<MetadataCollection> GetMetadataAsync (MetadataOptions options, IEnumerable<MetadataTag> tags, CancellationToken cancellationToken = default)
{
return GetMetadataAsync (options, tags, true, cancellationToken);
var ic = QueueGetMetadata (options, tags, cancellationToken);

if (ic == null)
return new MetadataCollection ();

await Engine.RunAsync (ic).ConfigureAwait (false);

return ProcessGetMetadataResponse (ic, options);
}

async Task SetMetadataAsync (MetadataCollection metadata, bool doAsync, CancellationToken cancellationToken)
ImapCommand QueueSetMetadata (MetadataCollection metadata, CancellationToken cancellationToken)
{
if (metadata == null)
throw new ArgumentNullException (nameof (metadata));
Expand All @@ -3452,7 +3481,7 @@ async Task SetMetadataAsync (MetadataCollection metadata, bool doAsync, Cancella
throw new NotSupportedException ("The IMAP server does not support the METADATA extension.");

if (metadata.Count == 0)
return;
return null;

var command = new StringBuilder ("SETMETADATA %F (");
var args = new List<object> {
Expand All @@ -3478,8 +3507,11 @@ async Task SetMetadataAsync (MetadataCollection metadata, bool doAsync, Cancella

Engine.QueueCommand (ic);

await Engine.RunAsync (ic, doAsync).ConfigureAwait (false);
return ic;
}

void ProcessSetMetadataResponse (ImapCommand ic)
{
ProcessResponseCodes (ic, null);

if (ic.Response != ImapCommandResponse.Ok)
Expand Down Expand Up @@ -3523,7 +3555,14 @@ async Task SetMetadataAsync (MetadataCollection metadata, bool doAsync, Cancella
/// </exception>
public override void SetMetadata (MetadataCollection metadata, CancellationToken cancellationToken = default)
{
SetMetadataAsync (metadata, false, cancellationToken).GetAwaiter ().GetResult ();
var ic = QueueSetMetadata (metadata, cancellationToken);

if (ic == null)
return;

Engine.Run (ic);

ProcessSetMetadataResponse (ic);
}

/// <summary>
Expand Down Expand Up @@ -3562,9 +3601,16 @@ public override void SetMetadata (MetadataCollection metadata, CancellationToken
/// <exception cref="ImapCommandException">
/// The server replied with a NO or BAD response.
/// </exception>
public override Task SetMetadataAsync (MetadataCollection metadata, CancellationToken cancellationToken = default)
public override async Task SetMetadataAsync (MetadataCollection metadata, CancellationToken cancellationToken = default)
{
return SetMetadataAsync (metadata, true, cancellationToken);
var ic = QueueSetMetadata (metadata, cancellationToken);

if (ic == null)
return;

await Engine.RunAsync (ic).ConfigureAwait (false);

ProcessSetMetadataResponse (ic);
}

class Quota
Expand Down

0 comments on commit c32a2a0

Please sign in to comment.