Browse Source

Merge pull request #816 from Islandora/fix-multifile-media

Refactoring multi-file media to create files like we do for other der…
pull/817/head
Alan Stanley 4 years ago committed by GitHub
parent
commit
792b3d3ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 48
      src/Controller/MediaSourceController.php
  2. 64
      src/MediaSource/MediaSourceService.php

48
src/Controller/MediaSourceController.php

@ -230,23 +230,41 @@ class MediaSourceController extends ControllerBase {
public function attachToMedia(
Media $media,
string $destination_field,
Request $request) {
Request $request
) {
$content_location = $request->headers->get('Content-Location', "");
$contents = $request->getContent();
if ($contents) {
$file = file_save_data($contents, $content_location, FILE_EXISTS_REPLACE);
if ($media->hasField($destination_field)) {
$media->{$destination_field}->setValue([
'target_id' => $file->id(),
]);
$media->save();
}
else {
$this->getLogger('islandora')->warning("Field $destination_field is not defined in Media Type {$media->bundle()}");
}
if (empty($content_location)) {
throw new BadRequestHttpException("Missing Content-Location header");
}
$content_type = $request->headers->get('Content-Type', "");
if (empty($content_type)) {
throw new BadRequestHttpException("Missing Content-Type header");
}
// Since we create both a Media and its File,
// start a transaction.
$transaction = $this->database->startTransaction();
try {
$this->service->putToMedia(
$media,
$destination_field,
$request->getContent(TRUE),
$content_type,
$content_location
);
// Should only see this with a GET request for testing.
return new Response("<h1>Complete</h1>");
}
catch (HttpException $e) {
$transaction->rollBack();
throw $e;
}
catch (\Exception $e) {
$transaction->rollBack();
throw new HttpException(500, $e->getMessage());
}
// Should only see this with a GET request for testing.
return new Response("<h1>Complete</h1>");
}
/**

64
src/MediaSource/MediaSourceService.php

@ -330,4 +330,68 @@ class MediaSourceService {
}
/**
* Creates a new File using the provided resource, adding it to a Media.
*
* @param \Drupal\media\MediaInterface $media
* The Media that will receive the new file.
* @param string $destination_field
* The field on the media where the file will go.
* @param resource $resource
* New file contents as a resource.
* @param string $mimetype
* New mimetype of contents.
* @param string $content_location
* Drupal/PHP stream wrapper for where to upload the binary.
*
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
* @throws \Symfony\Component\HttpKernel\Exception\HttpException
*/
public function putToMedia(
MediaInterface $media,
$destination_field,
$resource,
$mimetype,
$content_location
) {
if ($media->hasField($destination_field)) {
// Construct the File.
$file = $this->entityTypeManager->getStorage('file')->create([
'uid' => $this->account->id(),
'uri' => $content_location,
'filename' => $this->fileSystem->basename($content_location),
'filemime' => $mimetype,
'status' => FILE_STATUS_PERMANENT,
]);
// Validate file extension.
$bundle = $media->bundle();
$destination_field_config = $this->entityTypeManager->getStorage('field_config')->load("media.$bundle.$destination_field");
$valid_extensions = $destination_field_config->getSetting('file_extensions');
$errors = file_validate_extensions($file, $valid_extensions);
if (!empty($errors)) {
throw new BadRequestHttpException("Invalid file extension. Valid types are $valid_extensions");
}
$directory = $this->fileSystem->dirname($content_location);
if (!file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS)) {
throw new HttpException(500, "The destination directory does not exist, could not be created, or is not writable");
}
// Copy over the file content.
$this->updateFile($file, $resource, $mimetype);
$file->save();
// Update the media.
$media->{$destination_field}->setValue([
'target_id' => $file->id(),
]);
$media->save();
}
else {
throw new BadRequestHttpException("Media does not have destination field $destination_field");
}
}
}

Loading…
Cancel
Save