webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Reverted work on revisions

Browse Source 
Improved linkage of drawings and image manager.
Updated image updates to create new versions.
This commit is contained in:
Dan Brown
2018-05-20 16:40:30 +01:00
parent 6cdb943916
commit 0c9c1e4c6b
10 changed files with 33 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/Services/ImageService.php
View File

@ -2,7 +2,6 @@
use BookStack\Exceptions\ImageUploadException;
use BookStack\Image;
use BookStack\ImageRevision;
use BookStack\User;
use Exception;
use Intervention\Image\Exception\NotSupportedException;
@ -82,22 +81,6 @@ class ImageService extends UploadService
return $this->saveNew($name, $data, $type, $uploadedTo);
}
/**
* @param Image $image
* @param string $base64Uri
* @return Image
* @throws ImageUploadException
*/
public function updateImageFromBase64Uri(Image $image, string $base64Uri)
{
$splitData = explode(';base64,', $base64Uri);
if (count($splitData) < 2) {
throw new ImageUploadException("Invalid base64 image data provided");
}
$data = base64_decode($splitData[1]);
return $this->update($image, $data);
}
/**
* Gets an image from url and saves it to the database.
* @param $url
@ -168,59 +151,6 @@ class ImageService extends UploadService
return $image;
}
/**
* Update the content of an existing image.
* Uploaded the new image content and creates a revision for the old image content.
* @param Image $image
* @param $imageData
* @return Image
* @throws ImageUploadException
*/
private function update(Image $image, $imageData)
{
// Save image revision if not previously exists to ensure we always have
// a reference to the image files being uploaded.
if ($image->revisions()->count() === 0) {
$this->saveImageRevision($image);
}
$pathInfo = pathinfo($image->path);
$revisionCount = $image->revisionCount() + 1;
$newFileName = preg_replace('/^(.+?)(-v\d+)?$/', '$1-v' . $revisionCount, $pathInfo['filename']);
$image->path = str_replace_last($pathInfo['filename'], $newFileName, $image->path);
$image->url = $this->getPublicUrl($image->path);
$image->updated_by = user()->id;
$storage = $this->getStorage();
try {
$storage->put($image->path, $imageData);
$storage->setVisibility($image->path, 'public');
$image->save();
$this->saveImageRevision($image);
} catch (Exception $e) {
throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $image->path]));
}
return $image;
}
/**
* Save a new revision for an image.
* @param Image $image
* @return ImageRevision
*/
protected function saveImageRevision(Image $image)
{
$revision = new ImageRevision();
$revision->image_id = $image->id;
$revision->path = $image->path;
$revision->url = $image->url;
$revision->created_by = user()->id;
$revision->revision = $image->revisionCount() + 1;
$revision->save();
return $revision;
}
/**
* Checks if the image is a gif. Returns true if it is, else false.
@ -309,13 +239,6 @@ class ImageService extends UploadService
*/
public function destroy(Image $image)
{
// Destroy image revisions
foreach ($image->revisions as $revision) {
$this->destroyImagesFromPath($revision->path);
$revision->delete();
}
// Destroy main image
$this->destroyImagesFromPath($image->path);
$image->delete();
}