Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-06 07:57:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Speedup MailClient folders list generator

Browse source
This commit is contained in:
djmaze 2021-10-28 12:37:37 +02:00
parent 8636163f97
commit 913f1bfb10
3 changed files with 24 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

18
snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
View file

@ -140,24 +140,6 @@ class FolderCollection extends \MailSo\Base\Collection
$this->append($oMailFolder); $this->append($oMailFolder);
} }
public function SortByCallback(callable $fCallback) : void
{
if (\is_callable($fCallback))
{
$aList = $this->getArrayCopy();
\usort($aList, $fCallback);
foreach ($aList as $oItemFolder)
{
if ($oItemFolder->HasSubFolders())
{
$oItemFolder->SubFolders()->SortByCallback($fCallback);
}
}
}
}
public function jsonSerialize() public function jsonSerialize()
{ {
return \array_merge(parent::jsonSerialize(), array( return \array_merge(parent::jsonSerialize(), array(

192
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -1783,134 +1783,6 @@ class MailClient
return 1 === \count($aUids) && \is_numeric($aUids[0]) ? (int) $aUids[0] : null; return 1 === \count($aUids) && \is_numeric($aUids[0]) ? (int) $aUids[0] : null;
} }
public function folderListOptimization(array $aMailFoldersHelper, int $iOptimizationLimit = 0) : array
{
// optimization
if (10 < $iOptimizationLimit && $iOptimizationLimit < \count($aMailFoldersHelper))
{
if ($this->oLogger)
{
$this->oLogger->Write('Start optimization (limit:'.$iOptimizationLimit.') for '.\count($aMailFoldersHelper).' folders');
}
$iForeachLimit = 1;
$aFilteredNames = array(
'inbox',
'sent', 'send', 'outbox', 'sentmail', 'sendmail',
'drafts', 'draft',
'junk', 'spam', 'spambucket',
'trash', 'bin', 'deleted',
'archives', 'archive', 'allmail', 'all',
'starred', 'flagged', 'important',
'contacts', 'chats'
);
$aNewMailFoldersHelper = array();
$iCountLimit = $iForeachLimit;
foreach ($aMailFoldersHelper as $iIndex => /* @var $oImapFolder Folder */ $oFolder)
{
// mandatory folders
if ($oFolder && \in_array(\str_replace(' ', '', \strtolower($oFolder->NameRaw())), $aFilteredNames))
{
$aNewMailFoldersHelper[] = $oFolder;
$aMailFoldersHelper[$iIndex] = null;
}
}
foreach ($aMailFoldersHelper as $iIndex => /* @var $oImapFolder Folder */ $oFolder)
{
// subscribed folders
if ($oFolder && $oFolder->IsSubscribed())
{
$aNewMailFoldersHelper[] = $oFolder;
$aMailFoldersHelper[$iIndex] = null;
$iCountLimit--;
}
if (0 > $iCountLimit)
{
if ($iOptimizationLimit < \count($aNewMailFoldersHelper))
{
break;
}
else
{
$iCountLimit = $iForeachLimit;
}
}
}
$iCountLimit = $iForeachLimit;
if ($iOptimizationLimit >= \count($aNewMailFoldersHelper))
{
// name filter
foreach ($aMailFoldersHelper as $iIndex => /* @var $oImapFolder Folder */ $oFolder)
{
if ($oFolder && !\preg_match('/[{}\[\]]/', $oFolder->NameRaw()))
{
$aNewMailFoldersHelper[] = $oFolder;
$aMailFoldersHelper[$iIndex] = null;
$iCountLimit--;
}
if (0 > $iCountLimit)
{
if ($iOptimizationLimit < \count($aNewMailFoldersHelper))
{
break;
}
else
{
$iCountLimit = $iForeachLimit;
}
}
}
}
$iCountLimit = $iForeachLimit;
if ($iOptimizationLimit >= \count($aNewMailFoldersHelper))
{
// other
foreach ($aMailFoldersHelper as $iIndex => /* @var $oImapFolder Folder */ $oFolder)
{
if ($oFolder)
{
$aNewMailFoldersHelper[] = $oFolder;
$aMailFoldersHelper[$iIndex] = null;
$iCountLimit--;
}
if (0 > $iCountLimit)
{
if ($iOptimizationLimit < \count($aNewMailFoldersHelper))
{
break;
}
else
{
$iCountLimit = $iForeachLimit;
}
}
}
}
$aMailFoldersHelper = $aNewMailFoldersHelper;
if ($this->oLogger)
{
$this->oLogger->Write('Result optimization: '.\count($aMailFoldersHelper).' folders');
}
}
return $aMailFoldersHelper;
}
public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus, int $iOptimizationLimit, bool $bUseListStatus) : ?FolderCollection public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus, int $iOptimizationLimit, bool $bUseListStatus) : ?FolderCollection
{ {
$aImapSubscribedFoldersHelper = null; $aImapSubscribedFoldersHelper = null;
@ -1942,35 +1814,28 @@ class MailClient
return null; return null;
} }
$aMailFoldersHelper = array();
foreach ($aFolders as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder)
{
$aMailFoldersHelper[] = new Folder($oImapFolder,
($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($oImapFolder->FullNameRaw(), $aImapSubscribedFoldersHelper)))
|| $oImapFolder->IsInbox()
);
}
$iCount = \count($aMailFoldersHelper);
$aMailFoldersHelper = $this->folderListOptimization($aMailFoldersHelper, $iOptimizationLimit);
if (!$aMailFoldersHelper) {
return null;
}
$oFolderCollection = new FolderCollection; $oFolderCollection = new FolderCollection;
$oFolderCollection->IsMetadataSupported = $this->oImapClient->IsSupported('METADATA'); $oFolderCollection->IsMetadataSupported = $this->oImapClient->IsSupported('METADATA');
$oFolderCollection->IsThreadsSupported = $this->IsThreadsSupported(); $oFolderCollection->IsThreadsSupported = $this->IsThreadsSupported();
$oFolderCollection->IsSortSupported = $this->oImapClient->IsSupported('SORT'); $oFolderCollection->IsSortSupported = $this->oImapClient->IsSupported('SORT');
$oFolderCollection->IsListStatusSupported = $bUseListStatus; $oFolderCollection->IsListStatusSupported = $bUseListStatus;
$oFolderCollection->Optimized = $iCount !== \count($aMailFoldersHelper); $oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
$sINBOX = 'INBOX';
$aSortedByLenImapFolders = array(); $aSortedByLenImapFolders = array();
foreach ($aMailFoldersHelper as /* @var $oMailFolder Folder */ $oMailFolder) foreach ($aFolders as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder)
{ {
$oMailFolder = new Folder($oImapFolder,
($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($oImapFolder->FullNameRaw(), $aImapSubscribedFoldersHelper)))
|| $oImapFolder->IsInbox()
);
if ($oImapFolder->IsInbox()) {
$sINBOX = $oMailFolder->FullNameRaw();
}
$aSortedByLenImapFolders[$oMailFolder->FullNameRaw()] = $oMailFolder; $aSortedByLenImapFolders[$oMailFolder->FullNameRaw()] = $oMailFolder;
} }
unset($aMailFoldersHelper);
// Add NonExistent folders
$aAddedFolders = array(); $aAddedFolders = array();
foreach ($aSortedByLenImapFolders as /* @var $oMailFolder Folder */ $oMailFolder) foreach ($aSortedByLenImapFolders as /* @var $oMailFolder Folder */ $oMailFolder)
{ {
@ -1981,18 +1846,18 @@ class MailClient
{ {
\array_pop($aFolderExplode); \array_pop($aFolderExplode);
$sNonExistenFolderFullNameRaw = ''; $sNonExistentFolderFullNameRaw = '';
foreach ($aFolderExplode as $sFolderExplodeItem) foreach ($aFolderExplode as $sFolderExplodeItem)
{ {
$sNonExistenFolderFullNameRaw .= \strlen($sNonExistenFolderFullNameRaw) $sNonExistentFolderFullNameRaw .= \strlen($sNonExistentFolderFullNameRaw)
? $sDelimiter.$sFolderExplodeItem : $sFolderExplodeItem; ? $sDelimiter.$sFolderExplodeItem : $sFolderExplodeItem;
if (!isset($aSortedByLenImapFolders[$sNonExistenFolderFullNameRaw])) if (!isset($aSortedByLenImapFolders[$sNonExistentFolderFullNameRaw]))
{ {
try try
{ {
$aAddedFolders[$sNonExistenFolderFullNameRaw] = $aAddedFolders[$sNonExistentFolderFullNameRaw] =
Folder::NewNonExistentInstance($sNonExistenFolderFullNameRaw, $sDelimiter); Folder::NewNonExistentInstance($sNonExistentFolderFullNameRaw, $sDelimiter);
} }
catch (\Throwable $oExc) catch (\Throwable $oExc)
{ {
@ -2006,32 +1871,21 @@ class MailClient
$aSortedByLenImapFolders = \array_merge($aSortedByLenImapFolders, $aAddedFolders); $aSortedByLenImapFolders = \array_merge($aSortedByLenImapFolders, $aAddedFolders);
unset($aAddedFolders); unset($aAddedFolders);
\uasort($aSortedByLenImapFolders, function ($oFolderA, $oFolderB) { // Make sure the inbox is the first in list when sorted
return \strnatcmp($oFolderA->FullNameRaw(), $oFolderB->FullNameRaw()); if (isset($aSortedByLenImapFolders[$sINBOX])) {
}); $aSortedByLenImapFolders["\x00".$sINBOX] = $aSortedByLenImapFolders[$sINBOX];
unset($aSortedByLenImapFolders[$sINBOX]);
}
\uksort($aSortedByLenImapFolders, 'strnatcasecmp');
foreach ($aSortedByLenImapFolders as $oMailFolder) foreach ($aSortedByLenImapFolders as $oMailFolder)
{ {
$oFolderCollection->AddWithPositionSearch($oMailFolder); $oFolderCollection->AddWithPositionSearch($oMailFolder);
unset($oMailFolder);
} }
unset($aSortedByLenImapFolders); unset($aSortedByLenImapFolders);
$oFolderCollection->SortByCallback(function ($oFolderA, $oFolderB) {
$sA = \strtoupper($oFolderA->FullNameRaw());
$sB = \strtoupper($oFolderB->FullNameRaw());
switch (true)
{
case 'INBOX' === $sA:
return -1;
case 'INBOX' === $sB:
return 1;
}
return \strnatcasecmp($oFolderA->FullName(), $oFolderB->FullName());
});
$oNamespace = $this->oImapClient->GetNamespace(); $oNamespace = $this->oImapClient->GetNamespace();
if ($oNamespace) if ($oNamespace)
{ {

2
snappymail/v/0.0.0/app/localization/nl-NL/user.json
View file

@ -434,7 +434,7 @@
"DELETING_PROCESS": "Map aan het wissen", "DELETING_PROCESS": "Map aan het wissen",
"RENAMING_PROCESS": "Map hernoemen", "RENAMING_PROCESS": "Map hernoemen",
"TO_MANY_FOLDERS_DESC_1": "U heeft te veel mappen!", "TO_MANY_FOLDERS_DESC_1": "U heeft te veel mappen!",
"TO_MANY_FOLDERS_DESC_2": "Er worden er maar een deel weergegeven om prestatieproblemen te voorkomen.", "TO_MANY_FOLDERS_DESC_2": "Er wordt maar een deel weergegeven om prestatieproblemen te voorkomen.",
"HELP_DELETE_FOLDER": "Verwijder map", "HELP_DELETE_FOLDER": "Verwijder map",
"HELP_SHOW_HIDE_FOLDER": "Toon\/verberg map", "HELP_SHOW_HIDE_FOLDER": "Toon\/verberg map",
"HELP_CHECK_FOR_NEW_MESSAGES": "Controleer wel of niet op nieuwe berichten", "HELP_CHECK_FOR_NEW_MESSAGES": "Controleer wel of niet op nieuwe berichten",