Merge pull request #9 from erikaheidi/gdaisy

Refactored to use erikaheidi/gdaisy
erikaheidi · Jun 26, 2021 · 546c717 · 546c717
2 parents a650071 + 9e195a1
commit 546c717
Show file tree

Hide file tree

Showing 10 changed files with 259 additions and 216 deletions.
diff --git a/app/Command/Generate/TwitterController.php b/app/Command/Generate/TwitterController.php
@@ -3,9 +3,10 @@
 namespace App\Command\Generate;
 
 use App\ImageSource;
-use App\Service\TwitterServiceProvider;
 use App\Storage;
 use App\Template;
+use GDaisy\ImagePlaceholder;
+use GDaisy\PlaceholderInterface;
 use Minicli\Command\CommandController;
 
 class TwitterController extends CommandController
@@ -27,13 +28,27 @@ public function handle(): int
         $template = Template::create(Storage::root() . $template_file);
 
         $featured = [];
+        //build sources
         foreach ($template->sources as $key => $params) {
             /** @var ImageSource $source */
             $source = new $params['class'];
             $featured = array_merge($featured, $source->getImageList($this->getApp(), $params['count']));
         }
 
-        $template->build($featured);
+        //apply
+        /**
+         * @var string $key
+         * @var PlaceholderInterface $placeholder
+         */
+        foreach ($template->placeholders as $key => $placeholder) {
+            if ($placeholder instanceof ImagePlaceholder and $placeholder->image) {
+                $placeholder->apply($template->getResource(), ['image_file' => $placeholder->image]);
+                continue;
+            }
+
+            $placeholder->apply($template->getResource(), $featured[$key]);
+        }
+
         $template->write($save_path);
         $this->getPrinter()->info("Finished generating cover at $save_path.");
 

diff --git a/app/ImageSource/GhSponsorImageSource.php b/app/ImageSource/GhSponsorImageSource.php
@@ -33,7 +33,8 @@ public function getImageList(App $app, $limit = 5): array
             $avatar = Storage::downloadImage($sponsor->avatarUrl);
             $featured[self::$prefix . "$count"] = [
                 'screen_name' => $sponsor->login,
-                'avatar' => $avatar
+                'avatar' => $avatar,
+                'image_file' => $avatar
             ];
 
             $count++;

diff --git a/app/ImageSource/TwitterFollowerImageSource.php b/app/ImageSource/TwitterFollowerImageSource.php
@@ -34,7 +34,8 @@ public function getImageList(App $app, $limit = 5): array
             $avatar = Storage::downloadImage($avatar_path);
             $featured[self::$prefix . "$count"] = [
                 'screen_name' => $follower->screen_name,
-                'avatar' => $avatar
+                'avatar' => $avatar,
+                'image_file' => $avatar
             ];
 
             $count++;

diff --git a/app/Resources/templates/cover_basic.json b/app/Resources/templates/cover_basic.json
@@ -9,41 +9,59 @@
   },
   "elements": {
     "tw1": {
-      "pos_x": 486,
-      "pos_y": 272,
-      "width": 130,
-      "height": 130
+      "type": "image",
+      "properties": {
+        "pos_x": 486,
+        "pos_y": 272,
+        "width": 130,
+        "height": 130
+      }
     },
     "tw2": {
-      "pos_x": 670,
-      "pos_y": 270,
-      "width": 132,
-      "height": 132
+      "type": "image",
+      "properties": {
+        "pos_x": 670,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw3": {
-      "pos_x": 859,
-      "pos_y": 270,
-      "width": 132,
-      "height": 132
+      "type": "image",
+      "properties": {
+        "pos_x": 859,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw4": {
-      "pos_x": 1049,
-      "pos_y": 270,
-      "width": 132,
-      "height": 132
+      "type": "image",
+      "properties": {
+        "pos_x": 1049,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw5": {
-      "pos_x": 1236,
-      "pos_y": 270,
-      "width": 130,
-      "height": 130
+      "type": "image",
+      "properties": {
+        "pos_x": 1236,
+        "pos_y": 270,
+        "width": 130,
+        "height": 130
+      }
     },
     "cover":  {
-      "width": 1500,
-      "height": 500,
-      "pos_x": 0,
-      "pos_y":  0,
-      "image": "app/Resources/images/cover_basic.png"
+      "type": "image",
+      "properties": {
+        "width": 1500,
+        "height": 500,
+        "pos_x": 0,
+        "pos_y": 0,
+        "image": "app/Resources/images/cover_basic.png"
+      }
     }
   }
 }
diff --git a/app/Resources/templates/cover_colorful.json b/app/Resources/templates/cover_colorful.json
@@ -9,41 +9,59 @@
   },
   "elements": {
     "tw1": {
-      "pos_x": 486,
-      "pos_y": 272,
-      "width": 130,
-      "height": 130
+      "type": "image",
+      "properties": {
+        "pos_x": 486,
+        "pos_y": 272,
+        "width": 130,
+        "height": 130
+      }
     },
     "tw2": {
-      "pos_x": 670,
-      "pos_y": 270,
-      "width": 132,
-      "height": 132
+      "type": "image",
+      "properties": {
+        "pos_x": 670,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw3": {
-      "pos_x": 859,
-      "pos_y": 270,
-      "width": 132,
-      "height": 132
+      "type": "image",
+      "properties": {
+        "pos_x": 859,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw4": {
-      "pos_x": 1049,
-      "pos_y": 270,
-      "width": 132,
-      "height": 132
+      "type": "image",
+      "properties": {
+        "pos_x": 1049,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw5": {
-      "pos_x": 1236,
-      "pos_y": 270,
-      "width": 130,
-      "height": 130
+      "type": "image",
+      "properties": {
+        "pos_x": 1236,
+        "pos_y": 270,
+        "width": 130,
+        "height": 130
+      }
     },
     "cover":  {
-      "width": 1500,
-      "height": 500,
-      "pos_x": 0,
-      "pos_y":  0,
-      "image": "app/Resources/images/cover_colorful.png"
+      "type": "image",
+      "properties": {
+        "width": 1500,
+        "height": 500,
+        "pos_x": 0,
+        "pos_y": 0,
+        "image": "app/Resources/images/cover_colorful.png"
+      }
     }
   }
 }
diff --git a/app/Resources/templates/cover_neon.json b/app/Resources/templates/cover_neon.json
@@ -9,41 +9,59 @@
   },
   "elements": {
     "tw1": {
-      "pos_x": 838,
-      "pos_y": 275,
-      "width": 98,
-      "height": 98
+      "type": "image",
+      "properties": {
+        "pos_x": 486,
+        "pos_y": 272,
+        "width": 130,
+        "height": 130
+      }
     },
     "tw2": {
-      "pos_x": 962,
-      "pos_y": 275,
-      "width": 98,
-      "height": 98
+      "type": "image",
+      "properties": {
+        "pos_x": 670,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw3": {
-      "pos_x": 1087,
-      "pos_y": 275,
-      "width": 98,
-      "height": 98
+      "type": "image",
+      "properties": {
+        "pos_x": 859,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw4": {
-      "pos_x": 1212,
-      "pos_y": 275,
-      "width": 98,
-      "height": 98
+      "type": "image",
+      "properties": {
+        "pos_x": 1049,
+        "pos_y": 270,
+        "width": 132,
+        "height": 132
+      }
     },
     "tw5": {
-      "pos_x": 1338,
-      "pos_y": 275,
-      "width": 98,
-      "height": 98
+      "type": "image",
+      "properties": {
+        "pos_x": 1236,
+        "pos_y": 270,
+        "width": 130,
+        "height": 130
+      }
     },
     "cover":  {
-      "width": 1500,
-      "height": 500,
-      "pos_x": 0,
-      "pos_y":  0,
-      "image": "app/Resources/images/cover_neon.png"
+      "type": "image",
+      "properties": {
+        "width": 1500,
+        "height": 500,
+        "pos_x": 0,
+        "pos_y": 0,
+        "image": "app/Resources/images/cover_neon.png"
+      }
     }
   }
 }