Quit on invalid avatars

diff --git a/src/Console/MoveToAvatarCache.php b/src/Console/MoveToAvatarCache.php
index e7358c09d202c480120a17b21ce673f53d140ad1..60d87dee1841e8c2b7e10272bb28f72e4adbd37f 100644 (file)
--- a/src/Console/MoveToAvatarCache.php
+++ b/src/Console/MoveToAvatarCache.php
@@ -92,7 +92,7 @@ HELP;
                                echo $this->l10n->t('no resource in photo %s', $contact['photo']) . ' ';
                        }
 
-                       $this->storeAvatar($resourceid, $contact);
+                       $this->storeAvatar($resourceid, $contact, false);
                }
 
                $count  = 0;
@@ -103,12 +103,12 @@ HELP;
                                continue;
                        }
                        echo ++$count . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t";
-                       $this->storeAvatar($photo['resource-id'], $contact);
+                       $this->storeAvatar($photo['resource-id'], $contact, true);
                }
                return 0;
        }
 
-       private function storeAvatar(string $resourceid, array $contact)
+       private function storeAvatar(string $resourceid, array $contact, bool $quit_on_invalid)
        {
                $valid = !empty($resourceid);
                if ($valid) {
@@ -145,6 +145,11 @@ HELP;
                        $fields = ['photo' => '', 'thumb' => '', 'micro' => ''];
                }
 
+               if ($quit_on_invalid && $fields['photo'] == '') {
+                       echo ' ' . $this->l10n->t('Quit') . "\n";
+                       return;
+               }
+
                echo '5';
                Contact::update($fields, ['uri-id' => $contact['uri-id']]);
                echo '6';