Skip to content

Generate blurhash during preview creation #41052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
artonge wants to merge 12 commits into from
Closed

Generate blurhash during preview creation #41052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b23a212
FilesMetadata
ArtificialOwl Oct 17, 2023
3c4905a
run background process when executed from command line
ArtificialOwl Oct 18, 2023
5f150db
getMetadata()
ArtificialOwl Oct 18, 2023
184157a
returns metadata as array
ArtificialOwl Oct 19, 2023
2c214ed
Remove triggers for the old metadata API
artonge Oct 18, 2023
798a6b0
Port metadata providers to the new API
artonge Oct 18, 2023
2e0b667
Support dynamic metadata request on PROPFIND requests
artonge Oct 18, 2023
18a6f40
Support setting metadata in PROPPATCH requests
artonge Oct 18, 2023
e22eabf
Add kornrunner/php-blurhash to v1.2.2 in master
artonge Oct 19, 2023
10fc316
fixup! Support dynamic metadata request on PROPFIND requests
artonge Oct 19, 2023
22b638a
fixup! Support setting metadata in PROPPATCH requests
artonge Oct 19, 2023
2c35f70
Add blurhash metadata provider
artonge Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove triggers for the old metadata API 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Oct 19, 2023
commit 2c214ed5240ed55c8a6f69de7c9e62d88b887453
4 changes: 0 additions & 4 deletions apps/files/lib/Command/Scan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,6 @@ protected function scanFiles(string $user, string $path, bool $scanMetadata, Out
$this->abortIfInterrupted();
if ($scanMetadata) {
$node = $this->rootFolder->get($path);
if ($node instanceof File) {
$this->metadataManager->generateMetadata($node, false);
}

$this->filesMetadataManager->refreshMetadata(
$node,
IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND
Expand Down
22 changes: 7 additions & 15 deletions core/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
use OC\Authentication\Notifications\Notifier as AuthenticationNotifier;
use OC\Core\Listener\BeforeTemplateRenderedListener;
use OC\Core\Notification\CoreNotifier;
use OC\Metadata\FileEventListener;
use OC\FilesMetadata\Provider\ExifMetadataProvider;
use OC\FilesMetadata\Provider\OriginalDateTimeMetadataProvider;
use OC\FilesMetadata\Provider\SizeMetadataProvider;
use OC\TagManager;
use OCP\AppFramework\App;
use OCP\AppFramework\Http\Events\BeforeLoginTemplateRenderedEvent;
Expand All @@ -54,13 +56,10 @@
use OCP\DB\Events\AddMissingPrimaryKeyEvent;
use OCP\DB\Types;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Events\Node\NodeDeletedEvent;
use OCP\Files\Events\Node\NodeWrittenEvent;
use OCP\Files\Events\NodeRemovedFromCache;
use OCP\FilesMetadata\Event\MetadataLiveEvent;
use OCP\User\Events\BeforeUserDeletedEvent;
use OCP\User\Events\UserDeletedEvent;
use OCP\Util;
use OCP\IConfig;

/**
* Class Application
Expand Down Expand Up @@ -332,16 +331,9 @@ public function __construct() {
$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedWebAuthnCleanupListener::class);

// Metadata
/** @var IConfig $config */
$config = $container->get(IConfig::class);
if ($config->getSystemValueBool('enable_file_metadata', true)) {
/** @psalm-suppress InvalidArgument */
$eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
/** @psalm-suppress InvalidArgument */
$eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
/** @psalm-suppress InvalidArgument */
$eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
}
$eventDispatcher->addServiceListener(MetadataLiveEvent::class, ExifMetadataProvider::class, 1);
$eventDispatcher->addServiceListener(MetadataLiveEvent::class, SizeMetadataProvider::class);
$eventDispatcher->addServiceListener(MetadataLiveEvent::class, OriginalDateTimeMetadataProvider::class);

// Tags
$eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
Expand Down