From 19db5f35758a4f5fe338d0f763ccddaecce1183b Mon Sep 17 00:00:00 2001
From: Max Nuding <max.nuding@icloud.com>
Date: Sat, 27 Nov 2021 10:51:30 +0100
Subject: [PATCH] Resolved #3 Added link to selected album

---
 index.php              | 42 +++++++++++++++++++++++++++++++++++-------
 src/API/PhotoPrism.php | 21 ++++++++++++++++++---
 src/Entities/Album.php |  9 +++++++++
 3 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/index.php b/index.php
index e4dbabb..ac056f5 100644
--- a/index.php
+++ b/index.php
@@ -85,6 +85,9 @@ $footer = '<footer style="position: fixed;bottom: 0;left: 0;"><a href="/git/phla
             grid-row: 6;
             width: 100%;
         }
+        #viewAlbum {
+            #grid-row: 7;
+        }
         footer {
             margin: 8px;
         }
@@ -108,6 +111,7 @@ if (!isset($_POST['submit'])) {
     }
     $token = $_GET['token'];
     $tokens = explode(',', $token);
+    $album_url = null;
     try {
         $albums = $api->getAlbumsByTokens($tokens);
     } catch (\Exception $e) {
@@ -118,18 +122,29 @@ if (!isset($_POST['submit'])) {
     }
     ?>
     <div class="form-wrapper">
-        <!--<form method="POST" enctype="multipart/form-data" onsubmit="return validateForm();" id="uploadForm"> !-->
         <form method="POST" enctype="multipart/form-data" id="uploadForm">
             <label for="album">Zu Album hinzufügen</label>
             <select name="album" id="album">
-                <option value="">---</option>
+                <option value="" data-url="/">---</option>
                 <?php foreach ($albums as $album) {
                     $selected = $album->token === $token ? ' selected' : '';
-                    echo '<option value="' . $album->uid . '"' . $selected . '>' . $album->title . '</option>\n';
-                } ?>
+                    if ($album->token === $token) {
+                        $album_url = $album->getUrlPath();
+                    }
+                    echo '<option value="'
+                        . $album->uid
+                        . '"'
+                        . $selected
+                        . 'data-url='
+                        . ($album->getUrlPath() ?? '/')
+                        . '>'
+                        . $album->title
+                        . '</option>\n';
+                }
+                $album_url ??= '/';
+                $album_url = "https://photos.phlaym.net{$album_url}";
+                ?>
             </select>
-            <!--<label></label>
-            <input type="text" />!-->
             <input multiple type="file" name="files[]" id="input" required/>
             <input type="submit" name="submit" value="Upload" />
         </form>
@@ -138,6 +153,7 @@ if (!isset($_POST['submit'])) {
         <progress id="fileProgress"></progress>
         <label for="totalProgress">Gesamt:</label>
         <progress max="0" value="0" id="totalProgress"></progress>
+        <a href="<?=$album_url;?>" target="_blank" id="viewAlbum">Album ansehen</a>
     </div>
     <script>
         window.tooLarge = false;
@@ -151,6 +167,7 @@ if (!isset($_POST['submit'])) {
         const fileProgressLabel = document.querySelector('label[for=fileProgress]');
         const totalProgressLabel = document.querySelector('label[for=totalProgress]');
         const errorDiv = document.getElementById('error');
+        const albumAnchor = document.getElementById('viewAlbum');
 
         async function postData(url, data = {}, method = 'POST') {
             const response = await fetch(url, {
@@ -160,6 +177,11 @@ if (!isset($_POST['submit'])) {
             return response;
         }
 
+        albumInput.addEventListener('change', (event) => {
+            console.log(event);
+            albumAnchor.href = `https://photos.phlaym.net${albumInput.selectedOptions[0].dataset.url}`;
+        });
+
         form.addEventListener('submit', async function(event) {
             event.preventDefault();
             const isInvalid = window.tooLarge || window.tooManyFiles;
@@ -220,7 +242,13 @@ if (!isset($_POST['submit'])) {
                     const sizeInMb = file.size / 1024 / 1024;
                     if (sizeInMb >= maxFileSize) {
                         filesTooLarge.push(file.name);
-                        console.warn('File', file.name, 'is', sizeInMb, 'MB big, which is over the limit of', maxFileSize);
+                        console.warn(
+                            'File',
+                            file.name,
+                            'is',
+                            sizeInMb,
+                            'MB big, which is over the limit of',
+                            maxFileSize);
                     }
                     fileList.push(file);
                 }
diff --git a/src/API/PhotoPrism.php b/src/API/PhotoPrism.php
index 3d5ad3d..2fe24e6 100644
--- a/src/API/PhotoPrism.php
+++ b/src/API/PhotoPrism.php
@@ -4,11 +4,27 @@ namespace PhotoPrismUpload\API;
 
 use Monolog\Logger;
 use Monolog\Handler\RotatingFileHandler;
+use Monolog\Handler\HandlerInterface;
 use Psr\Log\LoggerInterface;
 use PhotoPrismUpload\Exceptions\NetworkException;
 use PhotoPrismUpload\Exceptions\AuthenticationException;
 use PhotoPrismUpload\Entities\Album;
 
+class LoggerFactory
+{
+    private static $handlers = [];
+
+    public static function addHandler(HandlerInterface $handler) {
+        self::$handlers[] = $handler;
+    }
+    public static function create(string $name) {
+        $l = new Logger($name);
+        $l->setHandlers(self::$handlers);
+        $l->info('Initialized');
+        return $l;
+    }
+}
+
 class PhotoPrism
 {
     protected string $base_url = 'https://photos.phlaym.net';
@@ -23,12 +39,11 @@ class PhotoPrism
     ) {
         $this->api_url = $this->base_url.'/api/v1';
         $this->config = $config;
-        $this->logger = new Logger('PhotoPrismUpload');
         if (empty($log_path)) {
             $log_path = __DIR__.'/logs/log.log';
         }
-        $handler = new RotatingFileHandler($log_path, 5, Logger::DEBUG, true);
-        $this->logger->pushHandler($handler);
+        LoggerFactory::addHandler(new RotatingFileHandler($log_path, 5, Logger::DEBUG, true));
+        $this->logger = LoggerFactory::create('PhotoPrismUpload');
         if (isset($_SESSION['pp_sessionid'])) {
             $this->session_id = $_SESSION['pp_sessionid'];
         }
diff --git a/src/Entities/Album.php b/src/Entities/Album.php
index f31c339..b6490b2 100644
--- a/src/Entities/Album.php
+++ b/src/Entities/Album.php
@@ -2,6 +2,7 @@
 namespace PhotoPrismUpload\Entities;
 
 use Monolog\Logger;
+use PhotoPrismUpload\API\LoggerFactory;
 
 class Album
 {
@@ -16,5 +17,13 @@ class Album
         $this->uid = $response['UID'];
         $this->slug = $response['Slug'];
         $this->title = $response['Title'];
+        $this->logger = LoggerFactory::create('PhotoPrismUpload.Album');
+    }
+
+    public function getUrlPath(): ?string {
+        if (empty($this->token)) {
+            return null;
+        }
+        return "/s/{$this->token}/{$this->slug}";
     }
 }