standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-15 19:06:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add password login option for some users, and further refinements to artwork management system

Browse source
This commit is contained in:
Alex Cabal 2024-01-06 19:10:52 -06:00
parent 8a1b11b815
commit 5a1c05d8c5
22 changed files with 234 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/Artwork.php
View file

@ -17,7 +17,7 @@ use function Safe\sprintf;
* @property string $ImageUrl
* @property string $ThumbUrl
* @property string $Thumb2xUrl
* @property string $ImageSize
* @property string $Dimensions
* @property Ebook $Ebook
* @property Museum $Museum
* @property ?ImageMimeType $MimeType
@ -48,7 +48,7 @@ class Artwork extends PropertiesBase{
protected $_ImageUrl = null;
protected $_ThumbUrl = null;
protected $_Thumb2xUrl = null;
protected $_ImageSize = null;
protected $_Dimensions = null;
protected $_Ebook = null;
protected $_Museum = null;
protected ?ImageMimeType $_MimeType = null;
@ -157,26 +157,20 @@ class Artwork extends PropertiesBase{
return $this->_Thumb2xUrl;
}
protected function GetImageSize(): string{
protected function GetDimensions(): string{
try{
$bytes = @filesize(WEB_ROOT . $this->ImageUrl);
$sizes = 'BKMGTP';
$factor = intval(floor((strlen((string)$bytes) - 1) / 3));
$sizeNumber = sprintf('%.1f', $bytes / pow(1024, $factor));
$sizeUnit = $sizes[$factor] ?? '';
$this->_ImageSize = $sizeNumber . $sizeUnit;
list($imageWidth, $imageHeight) = getimagesize(WEB_ROOT . $this->ImageUrl);
if($imageWidth && $imageHeight){
$this->_ImageSize .= ' (' . $imageWidth . ' × ' . $imageHeight . ')';
$this->_Dimensions .= $imageWidth . ' × ' . $imageHeight;
}
}
catch(Exception){
// Image doesn't exist
$this->_ImageSize = '';
$this->_Dimensions = '';
}
return $this->_ImageSize;
return $this->_Dimensions;
}
protected function GetEbook(): ?Ebook{
@ -217,7 +211,7 @@ class Artwork extends PropertiesBase{
$error->Add($ex);
}
if(trim($this->Exception) == ''){
if($this->Exception !== null && trim($this->Exception) == ''){
$this->Exception = null;
}
@ -517,11 +511,6 @@ class Artwork extends PropertiesBase{
return false;
}
public function HasMatchingMuseum(): bool{
return true;
}
// ***********
// ORM METHODS
// ***********