Compare commits

...

2 Commits

Author SHA1 Message Date
19db5f3575
Resolved #3 Added link to selected album 2021-11-27 10:51:30 +01:00
5ef5012224
Fixed alignment 2021-11-27 09:24:10 +01:00
3 changed files with 63 additions and 10 deletions

View File

@ -41,6 +41,7 @@ $footer = '<footer style="position: fixed;bottom: 0;left: 0;"><a href="/git/phla
label[for="album"] { label[for="album"] {
grid-column: 1; grid-column: 1;
grid-row: 1; grid-row: 1;
align-self: center;
} }
#album { #album {
grid-column: 2; grid-column: 2;
@ -84,6 +85,9 @@ $footer = '<footer style="position: fixed;bottom: 0;left: 0;"><a href="/git/phla
grid-row: 6; grid-row: 6;
width: 100%; width: 100%;
} }
#viewAlbum {
#grid-row: 7;
}
footer { footer {
margin: 8px; margin: 8px;
} }
@ -107,6 +111,7 @@ if (!isset($_POST['submit'])) {
} }
$token = $_GET['token']; $token = $_GET['token'];
$tokens = explode(',', $token); $tokens = explode(',', $token);
$album_url = null;
try { try {
$albums = $api->getAlbumsByTokens($tokens); $albums = $api->getAlbumsByTokens($tokens);
} catch (\Exception $e) { } catch (\Exception $e) {
@ -117,18 +122,29 @@ if (!isset($_POST['submit'])) {
} }
?> ?>
<div class="form-wrapper"> <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"> <form method="POST" enctype="multipart/form-data" id="uploadForm">
<label for="album">Zu Album hinzufügen</label> <label for="album">Zu Album hinzufügen</label>
<select name="album" id="album"> <select name="album" id="album">
<option value="">---</option> <option value="" data-url="/">---</option>
<?php foreach ($albums as $album) { <?php foreach ($albums as $album) {
$selected = $album->token === $token ? ' selected' : ''; $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> </select>
<!--<label></label>
<input type="text" />!-->
<input multiple type="file" name="files[]" id="input" required/> <input multiple type="file" name="files[]" id="input" required/>
<input type="submit" name="submit" value="Upload" /> <input type="submit" name="submit" value="Upload" />
</form> </form>
@ -137,6 +153,7 @@ if (!isset($_POST['submit'])) {
<progress id="fileProgress"></progress> <progress id="fileProgress"></progress>
<label for="totalProgress">Gesamt:</label> <label for="totalProgress">Gesamt:</label>
<progress max="0" value="0" id="totalProgress"></progress> <progress max="0" value="0" id="totalProgress"></progress>
<a href="<?=$album_url;?>" target="_blank" id="viewAlbum">Album ansehen</a>
</div> </div>
<script> <script>
window.tooLarge = false; window.tooLarge = false;
@ -150,6 +167,7 @@ if (!isset($_POST['submit'])) {
const fileProgressLabel = document.querySelector('label[for=fileProgress]'); const fileProgressLabel = document.querySelector('label[for=fileProgress]');
const totalProgressLabel = document.querySelector('label[for=totalProgress]'); const totalProgressLabel = document.querySelector('label[for=totalProgress]');
const errorDiv = document.getElementById('error'); const errorDiv = document.getElementById('error');
const albumAnchor = document.getElementById('viewAlbum');
async function postData(url, data = {}, method = 'POST') { async function postData(url, data = {}, method = 'POST') {
const response = await fetch(url, { const response = await fetch(url, {
@ -159,6 +177,11 @@ if (!isset($_POST['submit'])) {
return response; 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) { form.addEventListener('submit', async function(event) {
event.preventDefault(); event.preventDefault();
const isInvalid = window.tooLarge || window.tooManyFiles; const isInvalid = window.tooLarge || window.tooManyFiles;
@ -219,7 +242,13 @@ if (!isset($_POST['submit'])) {
const sizeInMb = file.size / 1024 / 1024; const sizeInMb = file.size / 1024 / 1024;
if (sizeInMb >= maxFileSize) { if (sizeInMb >= maxFileSize) {
filesTooLarge.push(file.name); 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); fileList.push(file);
} }

View File

@ -4,11 +4,27 @@ namespace PhotoPrismUpload\API;
use Monolog\Logger; use Monolog\Logger;
use Monolog\Handler\RotatingFileHandler; use Monolog\Handler\RotatingFileHandler;
use Monolog\Handler\HandlerInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use PhotoPrismUpload\Exceptions\NetworkException; use PhotoPrismUpload\Exceptions\NetworkException;
use PhotoPrismUpload\Exceptions\AuthenticationException; use PhotoPrismUpload\Exceptions\AuthenticationException;
use PhotoPrismUpload\Entities\Album; 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 class PhotoPrism
{ {
protected string $base_url = 'https://photos.phlaym.net'; protected string $base_url = 'https://photos.phlaym.net';
@ -23,12 +39,11 @@ class PhotoPrism
) { ) {
$this->api_url = $this->base_url.'/api/v1'; $this->api_url = $this->base_url.'/api/v1';
$this->config = $config; $this->config = $config;
$this->logger = new Logger('PhotoPrismUpload');
if (empty($log_path)) { if (empty($log_path)) {
$log_path = __DIR__.'/logs/log.log'; $log_path = __DIR__.'/logs/log.log';
} }
$handler = new RotatingFileHandler($log_path, 5, Logger::DEBUG, true); LoggerFactory::addHandler(new RotatingFileHandler($log_path, 5, Logger::DEBUG, true));
$this->logger->pushHandler($handler); $this->logger = LoggerFactory::create('PhotoPrismUpload');
if (isset($_SESSION['pp_sessionid'])) { if (isset($_SESSION['pp_sessionid'])) {
$this->session_id = $_SESSION['pp_sessionid']; $this->session_id = $_SESSION['pp_sessionid'];
} }

View File

@ -2,6 +2,7 @@
namespace PhotoPrismUpload\Entities; namespace PhotoPrismUpload\Entities;
use Monolog\Logger; use Monolog\Logger;
use PhotoPrismUpload\API\LoggerFactory;
class Album class Album
{ {
@ -16,5 +17,13 @@ class Album
$this->uid = $response['UID']; $this->uid = $response['UID'];
$this->slug = $response['Slug']; $this->slug = $response['Slug'];
$this->title = $response['Title']; $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}";
} }
} }