X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FMoveToAvatarCache.php;h=08c30c21530646804195436d90445e11b0a7edb8;hb=488fdd97913387c13630111cf02400815eef1b6f;hp=dfb2e2ec2db717de248a7a4d549c86a1b2d6de97;hpb=eddfab712299161e020c213b4f3608ff6f0c3271;p=friendica.git diff --git a/src/Console/MoveToAvatarCache.php b/src/Console/MoveToAvatarCache.php index dfb2e2ec2d..08c30c2153 100644 --- a/src/Console/MoveToAvatarCache.php +++ b/src/Console/MoveToAvatarCache.php @@ -86,41 +86,77 @@ HELP; $total = $this->dba->count('contact', $condition); $contacts = $this->dba->select('contact', ['id', 'avatar', 'photo', 'uri-id', 'url', 'avatar'], $condition, ['order' => ['id']]); while ($contact = $this->dba->fetch($contacts)) { - echo ++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t"; + $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false); $resourceid = Photo::ridFromURI($contact['photo']); if (empty($resourceid)) { - echo $this->l10n->t('no resource in photo %1', $contact['photo']) . "\n"; + $this->out($this->l10n->t('no resource in photo %s', $contact['photo']) . ' ', false); + } + + $this->storeAvatar($resourceid, $contact, false); + } + + $count = 0; + $totals = $this->dba->p("SELECT COUNT(DISTINCT(`resource-id`)) AS `total` FROM `photo` WHERE `contact-id` != ? AND `photo-type` = ?;", 0, Photo::CONTACT_AVATAR); + $total = $this->dba->fetch($totals)['total'] ?? 0; + $photos = $this->dba->p("SELECT `resource-id`, MAX(`contact-id`) AS `contact-id` FROM `photo` WHERE `contact-id` != ? AND `photo-type` = ? GROUP BY `resource-id`;", 0, Photo::CONTACT_AVATAR); + while ($photo = $this->dba->fetch($photos)) { + $contact = Contact::getById($photo['contact-id'], ['id', 'avatar', 'photo', 'uri-id', 'url', 'avatar']); + if (empty($contact)) { continue; } - echo '1'; + $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false); + $this->storeAvatar($photo['resource-id'], $contact, true); + } + return 0; + } + + private function storeAvatar(string $resourceid, array $contact, bool $quit_on_invalid) + { + $valid = !empty($resourceid); + if ($valid) { + $this->out('1', false); $photo = Photo::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]); if (empty($photo)) { - echo ' ' . $this->l10n->t('no photo with id %1', $resourceid) . "\n"; - continue; + $this->out(' ' . $this->l10n->t('no photo with id %s', $resourceid) . ' ', false); + $valid = false; } + } - echo '2'; + if ($valid) { + $this->out('2', false); $imgdata = Photo::getImageDataForPhoto($photo); if (empty($imgdata)) { - echo ' ' . $this->l10n->t('no image data for photo with id %1', $resourceid) . "\n"; - continue; + $this->out(' ' . $this->l10n->t('no image data for photo with id %s', $resourceid) . ' ', false); + $valid = false; } - echo '3'; + } + + if ($valid) { + $this->out('3', false); $image = new Image($imgdata, Images::getMimeTypeByData($imgdata)); if (!$image->isValid()) { - echo ' ' . $this->l10n->t('invalid image for id %1', $resourceid) . "\n"; - continue; + $this->out(' ' . $this->l10n->t('invalid image for id %s', $resourceid) . ' ', false); + $valid = false; } + } - echo '4'; + if ($valid) { + $this->out('4', false); $fields = Avatar::storeAvatarByImage($contact, $image); - echo '5'; - Contact::update($fields, ['uri-id' => $contact['uri-id']]); - echo '6'; + } else { + $fields = ['photo' => '', 'thumb' => '', 'micro' => '']; + } + + if ($quit_on_invalid && $fields['photo'] == '') { + $this->out(' ' . $this->l10n->t('Quit on invalid photo %s', $contact['avatar'])); Photo::delete(['resource-id' => $resourceid]); - echo ' ' . $fields['photo'] . "\n"; + return; } - return 0; + $this->out('5', false); + Contact::update($fields, ['uri-id' => $contact['uri-id']]); + $this->out('6', false); + Photo::delete(['resource-id' => $resourceid]); + $this->out(' ' . $fields['photo']); } }