refactor: re-organize files

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
2026-09-25 11:32:25 -04:00
parent 3fdb7b7a2e
commit 9a86292bcf
47 changed files with 244 additions and 228 deletions
+35 -35
View File
@@ -13,32 +13,32 @@ use DateTimeImmutable;
use Generator;
use KTXC\Logger\PlainFileLogger;
use KTXM\ProviderImap\Client\Client as ImapClient;
use KTXM\ProviderImap\Client\Command\AppendCommand;
use KTXM\ProviderImap\Client\Command\FetchManyCommand;
use KTXM\ProviderImap\Client\Command\FetchOneCommand;
use KTXM\ProviderImap\Client\Command\ExpungeCommand;
use KTXM\ProviderImap\Client\Command\ListCommand;
use KTXM\ProviderImap\Client\Command\SearchCommand;
use KTXM\ProviderImap\Client\Command\SelectCommand;
use KTXM\ProviderImap\Client\Command\SortCommand;
use KTXM\ProviderImap\Client\Command\StatusCommand;
use KTXM\ProviderImap\Client\Command\StoreCommand;
use KTXM\ProviderImap\Client\Command\CopyCommand;
use KTXM\ProviderImap\Client\Command\CreateCommand;
use KTXM\ProviderImap\Client\Command\RenameCommand;
use KTXM\ProviderImap\Client\Command\DeleteCommand;
use KTXM\ProviderImap\Client\FetchTarget;
use KTXM\ProviderImap\Client\FetchOptions;
use KTXM\ProviderImap\Client\IdentifierMode;
use KTXM\ProviderImap\Client\Protocol\Command\AppendCommand;
use KTXM\ProviderImap\Client\Protocol\Command\FetchManyCommand;
use KTXM\ProviderImap\Client\Protocol\Command\FetchOneCommand;
use KTXM\ProviderImap\Client\Protocol\Command\ExpungeCommand;
use KTXM\ProviderImap\Client\Protocol\Command\ListCommand;
use KTXM\ProviderImap\Client\Protocol\Command\SearchCommand;
use KTXM\ProviderImap\Client\Protocol\Command\SelectCommand;
use KTXM\ProviderImap\Client\Protocol\Command\SortCommand;
use KTXM\ProviderImap\Client\Protocol\Command\StatusCommand;
use KTXM\ProviderImap\Client\Protocol\Command\StoreCommand;
use KTXM\ProviderImap\Client\Protocol\Command\CopyCommand;
use KTXM\ProviderImap\Client\Protocol\Command\CreateCommand;
use KTXM\ProviderImap\Client\Protocol\Command\RenameCommand;
use KTXM\ProviderImap\Client\Protocol\Command\DeleteCommand;
use KTXM\ProviderImap\Client\Protocol\Command\Argument\MessageTarget;
use KTXM\ProviderImap\Client\Protocol\Command\Argument\FetchOptions;
use KTXM\ProviderImap\Client\Protocol\IdentifierMode;
use KTXM\ProviderImap\Client\ImapException;
use KTXM\ProviderImap\Client\ListReturnOptions;
use KTXM\ProviderImap\Client\Protocol\Command\Argument\ListReturnOptions;
use KTXM\ProviderImap\Client\Mailbox;
use KTXM\ProviderImap\Client\Message;
use KTXM\ProviderImap\Client\MessageAddress;
use KTXM\ProviderImap\Client\MessagePart;
use KTXM\ProviderImap\Client\Command\MoveCommand;
use KTXM\ProviderImap\Client\SearchCriteriaBuilder;
use KTXM\ProviderImap\Client\SequenceSet;
use KTXM\ProviderImap\Client\Protocol\Command\MoveCommand;
use KTXM\ProviderImap\Client\Protocol\Command\Argument\SearchCriteriaBuilder;
use KTXM\ProviderImap\Client\Protocol\SequenceSet;
use KTXF\Mail\Collection\CollectionRoles;
use KTXF\Resource\Filter\IFilter;
use KTXF\Resource\Filter\FilterComparisonOperator;
@@ -327,7 +327,7 @@ class RemoteMailService
}
yield from $this->imapClient()->perform(new FetchManyCommand(
FetchTarget::all(),
MessageTarget::all(),
$options,
));
@@ -360,7 +360,7 @@ class RemoteMailService
$this->imapClient()->perform(new SelectCommand($collection, true));
$request = new FetchManyCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$options,
);
@@ -392,7 +392,7 @@ class RemoteMailService
} else {
// Fetch BODYSTRUCTURE first to determine metadata (no body bytes transferred)
$message = $this->imapClient()->perform(new FetchOneCommand(
FetchTarget::uid(SequenceSet::items($uid)),
MessageTarget::uid(SequenceSet::items($uid)),
FetchOptions::of('BODYSTRUCTURE'),
));
$bodyStructure = $message->bodyStructure();
@@ -407,7 +407,7 @@ class RemoteMailService
// Start download stream
$stream = $this->decodeStream(
$this->imapClient()->download(FetchTarget::uid(SequenceSet::items($uid)), $partId ?? ''),
$this->imapClient()->download(MessageTarget::uid(SequenceSet::items($uid)), $partId ?? ''),
$encoding
);
@@ -543,7 +543,7 @@ class RemoteMailService
$this->imapClient()->perform(new SelectCommand($collection, false));
$this->imapClient()->perform(new StoreCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$flags,
$action,
));
@@ -558,7 +558,7 @@ class RemoteMailService
return [];
}
$target = FetchTarget::uid(SequenceSet::items(...array_values($uids)));
$target = MessageTarget::uid(SequenceSet::items(...array_values($uids)));
$this->imapClient()->perform(new SelectCommand($collection, false));
$this->imapClient()->perform(new StoreCommand($target, ['\\Deleted'], '+'));
@@ -581,7 +581,7 @@ class RemoteMailService
if (!empty($flagsToAdd)) {
$this->imapClient()->perform(new StoreCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$flagsToAdd,
'+',
));
@@ -589,7 +589,7 @@ class RemoteMailService
if (!empty($flagsToRemove)) {
$this->imapClient()->perform(new StoreCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$flagsToRemove,
'-',
));
@@ -608,23 +608,23 @@ class RemoteMailService
if ($rfc6851) {
$this->imapClient()->perform(new SelectCommand($sourceCollection, false));
$response = $this->imapClient()->perform(new MoveCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$targetCollection,
));
} else {
$this->imapClient()->perform(new SelectCommand($sourceCollection, false));
$response = $this->imapClient()->perform(new CopyCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$targetCollection,
));
if ($response->isOk()) {
$this->imapClient()->perform(new StoreCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
['\\Deleted'],
'+',
));
$this->imapClient()->perform(new ExpungeCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
));
}
}
@@ -656,7 +656,7 @@ class RemoteMailService
$this->imapClient()->perform(new SelectCommand($sourceCollection, false));
$response = $this->imapClient()->perform(new CopyCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$targetCollection,
));
@@ -881,7 +881,7 @@ class RemoteMailService
}
$messages = iterator_to_array($this->imapClient()->perform(new FetchManyCommand(
FetchTarget::uid(SequenceSet::items(...array_values($uids))),
MessageTarget::uid(SequenceSet::items(...array_values($uids))),
$options,
)));