Delete invalid photo data

This commit is contained in:
Michael 2022-05-24 17:49:29 +00:00
parent 0374f0e523
commit 2ead69c7a5

View file

@ -86,34 +86,48 @@ 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)) {
$valid = true;
echo ++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t";
$resourceid = Photo::ridFromURI($contact['photo']);
if (empty($resourceid)) {
echo $this->l10n->t('no resource in photo %s', $contact['photo']) . "\n";
continue;
}
echo '1';
$photo = Photo::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
if (empty($photo)) {
echo ' ' . $this->l10n->t('no photo with id %s', $resourceid) . "\n";
continue;
$valid = false;
}
echo '2';
$imgdata = Photo::getImageDataForPhoto($photo);
if (empty($imgdata)) {
echo ' ' . $this->l10n->t('no image data for photo with id %s', $resourceid) . "\n";
continue;
}
echo '3';
$image = new Image($imgdata, Images::getMimeTypeByData($imgdata));
if (!$image->isValid()) {
echo ' ' . $this->l10n->t('invalid image for id %s', $resourceid) . "\n";
continue;
if ($valid) {
echo '1';
$photo = Photo::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
if (empty($photo)) {
echo ' ' . $this->l10n->t('no photo with id %s', $resourceid) . "\n";
$valid = false;
}
}
if ($valid) {
echo '2';
$imgdata = Photo::getImageDataForPhoto($photo);
if (empty($imgdata)) {
echo ' ' . $this->l10n->t('no image data for photo with id %s', $resourceid) . "\n";
$valid = false;
}
}
if ($valid) {
echo '3';
$image = new Image($imgdata, Images::getMimeTypeByData($imgdata));
if (!$image->isValid()) {
echo ' ' . $this->l10n->t('invalid image for id %s', $resourceid) . "\n";
$valid = false;
}
}
if ($valid) {
echo '4';
$fields = Avatar::storeAvatarByImage($contact, $image);
} else {
$fields = ['photo' => '', 'thumb' => '', 'micro' => ''];
}
echo '4';
$fields = Avatar::storeAvatarByImage($contact, $image);
echo '5';
Contact::update($fields, ['uri-id' => $contact['uri-id']]);
echo '6';