Track updates and fix parent preview fallback image calculation

Author: thekid

src/main/php/de/thekid/dialog/api/Entries.php

@@ -106,20 +106,22 @@ public function update(#[Value] $user, string $id, #[Entity] Entry $source) {
 
     // Join places, autocomplete seems to only work for strings
     $suggest= '';
-    foreach ($source->locations as $location) {
+    foreach ($source->locations ?? $entry['locations'] as $location) {
       $suggest.= ' '.$location['name'];
     }
-    $changes= $source->attributes() + [
+    $content= $source->content ?? $entry['content'];
+    $is= $source->is ?? $entry['is'];
+
+    $r= $this->repository->modify($id, ['$set' => $source->attributes() + [
       'preview'     => $preview,
       'modified'    => time(),
       '_searchable' => [
-        'boost'   => isset($source->is['journey']) ? 2.0 : 1.0,
+        'boost'   => isset($is['journey']) ? 2.0 : 1.0,
         'suggest' => trim($suggest),
-        'content' => strip_tags(strtr($source->content, ['<br>' => "\n", '</p><p>' => "\n"]))
+        'content' => strip_tags(strtr($content, ['<br>' => "\n", '</p><p>' => "\n"])),
       ],
-    ];
-    $n= $this->repository->modify($id, ['$set' => $changes])->modified();
-    return ['updated' => $n];
+    ]]);
+    return ['updated' => $r->modified()];
   }
 
   #[Delete('/{id:.+(/.+)?}')]

src/main/php/de/thekid/dialog/api/Entry.php

@@ -22,13 +22,13 @@ class Entry implements Value {
     set { $this->attributes['title']= $value; }
   }
 
-  public string $content {
-    get => $this->attributes['content'];
+  public ?string $content {
+    get => $this->attributes['content'] ?? null;
     set { $this->attributes['content']= $value; }
   }
 
-  public array<string, mixed> $is {
-    get => $this->attributes['is'];
+  public ?array<string, mixed> $is {
+    get => $this->attributes['is'] ?? null;
     set { $this->attributes['is']= $value; }
   }
 
@@ -37,18 +37,18 @@ class Entry implements Value {
     set { $this->attributes['parent']= $value; }
   }
 
-  public array<string> $keywords {
-    get => $this->attributes['keywords'] ?? [];
+  public ?array<string> $keywords {
+    get => $this->attributes['keywords'] ?? null;
     set { $this->attributes['keywords']= $value; }
   }
 
-  public array<array<mixed>> $locations {
-    get => $this->attributes['locations'] ?? [];
+  public ?array<array<mixed>> $locations {
+    get => $this->attributes['locations'] ?? null;
     set { $this->attributes['locations']= $value; }
   }
 
-  public array<string, mixed> $weather {
-    get => $this->attributes['weather'];
+  public ?array<string, mixed> $weather {
+    get => $this->attributes['weather'] ?? null;
     set { $this->attributes['weather']= $value; }
   }
 

src/main/php/de/thekid/dialog/import/Content.php

@@ -21,6 +21,6 @@ public function entryFrom(Description $description): array<string, mixed> {
   }
 
   public function contentsIn(Files $files): iterable {
-    yield from $this->mediaIn($files);
+    return yield from $this->mediaIn($files);
   }
 }

src/main/php/de/thekid/dialog/import/Journey.php

@@ -9,6 +9,7 @@ class Journey extends Source {
 
   /** Subfolders of a journey form its child contents */
   private function childrenIn(Files $files): iterable {
+    $updated= false;
     $children= [];
     foreach ($this->entry['$children'] ?? [] as $child) {
       $children[$child['slug']]= $child;
@@ -19,7 +20,7 @@ private function childrenIn(Files $files): iterable {
         $folder= $path->asFolder();
         $slug= $this->entry['slug'].'/'.$folder->dirname;
 
-        yield from new Content($folder, new File($folder, 'content.md'), $children[$slug] ?? null)
+        $updated|= yield from new Content($folder, new File($folder, 'content.md'), $children[$slug] ?? null)
           ->nestedIn($this->entry['slug'])
           ->synchronize($files)
         ;
@@ -29,7 +30,9 @@ private function childrenIn(Files $files): iterable {
 
     foreach ($children as $rest) {
       yield new DeleteEntry($rest['slug']);
+      $updated= true;
     }
+    return $updated;
   }
 
   public function entryFrom(Description $description): array<string, mixed> {
@@ -50,7 +53,9 @@ public function entryFrom(Description $description): array<string, mixed> {
   }
 
   public function contentsIn(Files $files): iterable {
-    yield from $this->mediaIn($files);
-    yield from $this->childrenIn($files);
+    $updated= false;
+    $updated|= yield from $this->mediaIn($files);
+    $updated|= yield from $this->childrenIn($files);
+    return $updated;
   }
 }

src/main/php/de/thekid/dialog/import/LookupWeather.php

@@ -9,10 +9,10 @@
 class LookupWeather extends Task {
   private $weather= new OpenMeteo('https://open-meteo.com/v1');
 
-  public function __construct(private array<string, mixed> $entry, private array<mixed> $images) { }
+  public function __construct(private array<string, mixed> $entry) { }
 
   public function execute(Endpoint $api) {
-    if (empty($this->images)) {
+    if (empty($this->entry['images'])) {
       yield 'skip' => 'no images';
       return null;
     }
@@ -24,7 +24,7 @@ public function execute(Endpoint $api) {
 
       // Infer date range from first and last images
       $dates= [];
-      foreach ($this->images as $image) {
+      foreach ($this->entry['images'] as $image) {
         $dates[]= new Date($image['meta']['dateTime'], $tz);
       }
       usort($dates, fn($a, $b) => $b->compareTo($a));

src/main/php/de/thekid/dialog/import/Source.php

@@ -54,6 +54,7 @@ public function origin(): Folder { return $this->origin; }
 
   /** Yields all the media files in this source */
   protected function mediaIn(Files $files): iterable {
+    $updated= false;
     $images= [];
     foreach ($this->entry['images'] ?? [] as $image) {
       $images[$image['name']]= $image;
@@ -63,13 +64,16 @@ protected function mediaIn(Files $files): iterable {
       $name= $file->filename;
       if (!isset($images[$name]) || $file->lastModified() > $images[$name]['modified']) {
         $this->entry['images'][$name]= yield new UploadMedia($this->entry['slug'], $file, $processing);
+        $updated= true;
       }
       unset($images[$name]);
     }
 
     foreach ($images as $rest) {
       yield new DeleteMedia($this->entry['slug'], $rest['name']);
+      $updated= true;
     }
+    return $updated;
   }
 
   /** Returns an entry from the given description */
@@ -79,23 +83,27 @@ public abstract function entryFrom(Description $description): array<string, mixe
   public abstract function contentsIn(Files $files): iterable;
 
   /** Yields tasks to synchronize this source */
-  public function synchronize(Files $files) {
+  public function synchronize(Files $files): iterable {
     $this->entry??= yield new FetchEntry($this->name());
     if (!isset($this->entry['modified']) || $this->file->lastModified() > $this->entry['modified']) {
       $changes= $this->entryFrom(self::$descriptions->parse($this->file));
-      $updated= time();
+      $this->entry= $changes + ($this->entry ?? []);
+      $updated= true;
+    } else {
+      $changes= [];
+      $updated= false;
     }
 
     // Although the description file may not have changed, nested contents
     // may have, so process them unconditionally.
-    yield from $this->contentsIn($files);
+    $updated|= yield from $this->contentsIn($files);
 
-    if (isset($updated)) {
-      $changes['locations']= yield new LookupLocationInfos($changes);
-      $changes['weather']= yield new LookupWeather($changes, $this->entry['images'] ?? []);
-      $changes['published']= time();
-      yield new PublishEntry($this->entry['slug'], $changes);
+    if ($updated) {
+      $changes['locations']= $this->entry['locations']= yield new LookupLocationInfos($this->entry);
+      $changes['weather']= $this->entry['weather']= yield new LookupWeather($this->entry);
+      yield new PublishEntry($this->entry['slug'], $changes + ['published' => time()]);
     }
+    return $updated;
   }
 
   /** @return string */