nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change output function

Browse source
This commit is contained in:
Michael 2022-05-25 05:24:31 +00:00
parent e5e509ea21
commit dadebdd061
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Console/MoveToAvatarCache.php
View file

@ -86,10 +86,10 @@ HELP;
$total = $this->dba->count('contact', $condition); $total = $this->dba->count('contact', $condition);
$contacts = $this->dba->select('contact', ['id', 'avatar', 'photo', 'uri-id', 'url', 'avatar'], $condition, ['order' => ['id']]); $contacts = $this->dba->select('contact', ['id', 'avatar', 'photo', 'uri-id', 'url', 'avatar'], $condition, ['order' => ['id']]);
while ($contact = $this->dba->fetch($contacts)) { 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']); $resourceid = Photo::ridFromURI($contact['photo']);
if (empty($resourceid)) { if (empty($resourceid)) {
echo $this->l10n->t('no resource in photo %s', $contact['photo']) . ' '; $this->out($this->l10n->t('no resource in photo %s', $contact['photo']) . ' ', false);
} }
$this->storeAvatar($resourceid, $contact, false); $this->storeAvatar($resourceid, $contact, false);
@ -104,7 +104,7 @@ HELP;
if (empty($contact)) { if (empty($contact)) {
continue; continue;
} }
echo ++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t"; $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false);
$this->storeAvatar($photo['resource-id'], $contact, true); $this->storeAvatar($photo['resource-id'], $contact, true);
} }
return 0; return 0;
@ -114,49 +114,49 @@ HELP;
{ {
$valid = !empty($resourceid); $valid = !empty($resourceid);
if ($valid) { if ($valid) {
echo '1'; $this->out('1', false);
$photo = Photo::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]); $photo = Photo::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
if (empty($photo)) { if (empty($photo)) {
echo ' ' . $this->l10n->t('no photo with id %s', $resourceid) . ' '; $this->out(' ' . $this->l10n->t('no photo with id %s', $resourceid) . ' ', false);
$valid = false; $valid = false;
} }
} }
if ($valid) { if ($valid) {
echo '2'; $this->out('2', false);
$imgdata = Photo::getImageDataForPhoto($photo); $imgdata = Photo::getImageDataForPhoto($photo);
if (empty($imgdata)) { if (empty($imgdata)) {
echo ' ' . $this->l10n->t('no image data for photo with id %s', $resourceid) . ' '; $this->out(' ' . $this->l10n->t('no image data for photo with id %s', $resourceid) . ' ', false);
$valid = false; $valid = false;
} }
} }
if ($valid) { if ($valid) {
echo '3'; $this->out('3', false);
$image = new Image($imgdata, Images::getMimeTypeByData($imgdata)); $image = new Image($imgdata, Images::getMimeTypeByData($imgdata));
if (!$image->isValid()) { if (!$image->isValid()) {
echo ' ' . $this->l10n->t('invalid image for id %s', $resourceid) . ' '; $this->out(' ' . $this->l10n->t('invalid image for id %s', $resourceid) . ' ', false);
$valid = false; $valid = false;
} }
} }
if ($valid) { if ($valid) {
echo '4'; $this->out('4', false);
$fields = Avatar::storeAvatarByImage($contact, $image); $fields = Avatar::storeAvatarByImage($contact, $image);
} else { } else {
$fields = ['photo' => '', 'thumb' => '', 'micro' => '']; $fields = ['photo' => '', 'thumb' => '', 'micro' => ''];
} }
if ($quit_on_invalid && $fields['photo'] == '') { if ($quit_on_invalid && $fields['photo'] == '') {
echo ' ' . $this->l10n->t('Quit on invalid photo %s', $contact['avatar']) . "\n"; $this->out(' ' . $this->l10n->t('Quit on invalid photo %s', $contact['avatar']));
Photo::delete(['resource-id' => $resourceid]); Photo::delete(['resource-id' => $resourceid]);
return; return;
} }
echo '5'; $this->out('5', false);
Contact::update($fields, ['uri-id' => $contact['uri-id']]); Contact::update($fields, ['uri-id' => $contact['uri-id']]);
echo '6'; $this->out('6', false);
Photo::delete(['resource-id' => $resourceid]); Photo::delete(['resource-id' => $resourceid]);
echo ' ' . $fields['photo'] . "\n"; $this->out(' ' . $fields['photo']);
} }
} }