Skip to content

Commit

Permalink
chore: composer run cs:fix
Browse files Browse the repository at this point in the history 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Sep 14, 2024
1 parent 749fa2d commit b059d12
Show file tree
Hide file tree
Showing 82 changed files with 9,260 additions and 9,533 deletions.
186 changes: 93 additions & 93 deletions appinfo/routes.php
View file

Large diffs are not rendered by default.

38 changes: 18 additions & 20 deletions lib/AppInfo/Application.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,34 @@

namespace OCA\Maps\AppInfo;


use OCA\DAV\Events\CardCreatedEvent;
use OCA\DAV\Events\CardDeletedEvent;
use OCA\DAV\Events\CardUpdatedEvent;
use OCA\Files\Event\LoadAdditionalScriptsEvent;
use OCA\Files\Event\LoadSidebar;
use OCA\Maps\Hooks\FileHooks;
use OCA\Maps\Listener\CardCreatedListener;
use OCA\Maps\Listener\CardDeletedListener;
use OCA\Maps\Listener\CardUpdatedListener;
use OCA\Maps\Listener\LoadAdditionalScriptsListener;
use OCA\Maps\Listener\LoadSidebarListener;
use \OCP\AppFramework\App;
use OCA\Maps\Service\PhotofilesService;
use OCA\Maps\Service\TracksService;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\AppFramework\Http\EmptyFeaturePolicy;
use OCP\EventDispatcher\IEventDispatcher;
use \OCP\IServerContainer;
use OCA\Maps\Hooks\FileHooks;
use OCA\Maps\Service\PhotofilesService;
use OCA\Maps\Service\TracksService;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCA\Files\Event\LoadAdditionalScriptsEvent;
use OCA\DAV\Events\CardCreatedEvent;
use OCA\DAV\Events\CardUpdatedEvent;
use OCA\DAV\Events\CardDeletedEvent;
use OCA\Maps\Listener\LoadAdditionalScriptsListener;
use OCA\Maps\Listener\CardCreatedListener;
use OCA\Maps\Listener\CardUpdatedListener;
use OCA\Maps\Listener\CardDeletedListener;
use OCP\IServerContainer;
use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;


class Application extends App implements IBootstrap {
public const APP_ID = 'maps';

public function __construct (array $urlParams=array()) {
parent::__construct('maps', $urlParams);
}
public function __construct(array $urlParams = []) {
parent::__construct('maps', $urlParams);
}

public function register(IRegistrationContext $context): void {
// ... registration logic goes here ...
Expand Down Expand Up @@ -73,7 +71,7 @@ public function register(IRegistrationContext $context): void {

public function boot(IBootContext $context): void {
// ... boot logic goes here ...
$context->getAppContainer()->registerService('FileHooks', function($c) {
$context->getAppContainer()->registerService('FileHooks', function ($c) {
return new FileHooks(
$c->query(IServerContainer::class)->getRootFolder(),
\OC::$server->query(PhotofilesService::class),
Expand Down
62 changes: 29 additions & 33 deletions lib/BackgroundJob/AddPhotoJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,13 @@

namespace OCA\Maps\BackgroundJob;

use \OCP\BackgroundJob\QueuedJob;
use \OCP\BackgroundJob\IJobList;
use \OCP\AppFramework\Utility\ITimeFactory;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IUserManager;
use OCP\IConfig;
use OCP\Files\IRootFolder;

use OCA\Maps\Service\PhotofilesService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\QueuedJob;
use OCP\Files\IRootFolder;
use OCP\ICache;

use OCP\ICacheFactory;

class AddPhotoJob extends QueuedJob {

Expand All @@ -38,35 +34,35 @@ class AddPhotoJob extends QueuedJob {
/** @var ICache */
private ICache $backgroundJobCache;

/**
* UserInstallScanJob constructor.
*
* A QueuedJob to scan user storage for photos and tracks
*
/**
* UserInstallScanJob constructor.
*
* A QueuedJob to scan user storage for photos and tracks
*
* @param ITimeFactory $timeFactory
* @param PhotofilesService $photofilesService
*/
public function __construct(ITimeFactory $timeFactory,
IRootFolder $root,
PhotofilesService $photofilesService,
ICacheFactory $cacheFactory) {
parent::__construct($timeFactory);
$this->photofilesService = $photofilesService;
$this->root = $root;
*/
public function __construct(ITimeFactory $timeFactory,
IRootFolder $root,
PhotofilesService $photofilesService,
ICacheFactory $cacheFactory) {
parent::__construct($timeFactory);
$this->photofilesService = $photofilesService;
$this->root = $root;
$this->cacheFactory = $cacheFactory;
$this->backgroundJobCache = $this->cacheFactory->createDistributed('maps:background-jobs');
}
}

public function run($arguments) {
$userFolder = $this->root->getUserFolder($arguments['userId']);
$files = $userFolder->getById($arguments['photoId']);
if (empty($files)) {
return;
}
$file = array_shift($files);
$this->photofilesService->addPhotoNow($file, $arguments['userId']);
public function run($arguments) {
$userFolder = $this->root->getUserFolder($arguments['userId']);
$files = $userFolder->getById($arguments['photoId']);
if (empty($files)) {
return;
}
$file = array_shift($files);
$this->photofilesService->addPhotoNow($file, $arguments['userId']);

$counter = $this->backgroundJobCache->get('recentlyAdded:'.$arguments['userId']) ?? 0;
$this->backgroundJobCache->set('recentlyAdded:'.$arguments['userId'], (int) $counter + 1, 60 * 60 * 3);
}
$this->backgroundJobCache->set('recentlyAdded:'.$arguments['userId'], (int)$counter + 1, 60 * 60 * 3);
}
}
52 changes: 25 additions & 27 deletions lib/BackgroundJob/LaunchUsersInstallScanJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,33 @@

namespace OCA\Maps\BackgroundJob;

use \OCP\BackgroundJob\QueuedJob;
use \OCP\BackgroundJob\IJobList;
use \OCP\AppFramework\Utility\ITimeFactory;
use OCP\IUserManager;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\QueuedJob;
use OCP\IUser;

use \OCA\Maps\BackgroundJob\UserInstallScanJob;
use OCP\IUserManager;

class LaunchUsersInstallScanJob extends QueuedJob {

private $jobList;

/**
* LaunchUsersInstallScanJob constructor.
*
* A QueuedJob to launch a scan job for each user
*
* @param IJobList $jobList
*/
public function __construct(ITimeFactory $timeFactory, IJobList $jobList, IUserManager $userManager) {
parent::__construct($timeFactory);
$this->jobList = $jobList;
$this->userManager = $userManager;
}

public function run($arguments) {
\OC::$server->getLogger()->debug('Launch users install scan jobs cronjob executed');
$this->userManager->callForSeenUsers(function (IUser $user) {
$this->jobList->add(UserInstallScanJob::class, ['userId' => $user->getUID()]);
});
}
private $jobList;

/**
* LaunchUsersInstallScanJob constructor.
*
* A QueuedJob to launch a scan job for each user
*
* @param IJobList $jobList
*/
public function __construct(ITimeFactory $timeFactory, IJobList $jobList, IUserManager $userManager) {
parent::__construct($timeFactory);
$this->jobList = $jobList;
$this->userManager = $userManager;
}

public function run($arguments) {
\OC::$server->getLogger()->debug('Launch users install scan jobs cronjob executed');
$this->userManager->callForSeenUsers(function (IUser $user) {
$this->jobList->add(UserInstallScanJob::class, ['userId' => $user->getUID()]);
});
}
}
64 changes: 32 additions & 32 deletions lib/BackgroundJob/LookupMissingGeoJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@

namespace OCA\Maps\BackgroundJob;

use \OCA\Maps\Service\AddressService;
use \OCP\BackgroundJob\QueuedJob;
use \OCP\BackgroundJob\IJobList;
use \OCP\AppFramework\Utility\ITimeFactory;
use OCA\Maps\Service\AddressService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\QueuedJob;

class LookupMissingGeoJob extends QueuedJob {

/** @var AddressService */
private $addressService;

/** @var AddressService */
private $jobList;

/**
* LookupMissingGeoJob constructor.
*
* A QueuedJob to lookup missing geo information of addresses
*
* @param AddressService $service
* @param IJobList $jobList
*/
public function __construct(ITimeFactory $timeFactory, AddressService $service, IJobList $jobList) {
parent::__construct($timeFactory);
$this->addressService = $service;
$this->jobList = $jobList;
}

public function run($arguments) {
\OC::$server->getLogger()->debug('Maps address lookup cronjob executed');
// lookup at most 200 addresses
if (!$this->addressService->lookupMissingGeo(200)){
// if not all addresses where looked up successfully add a new job for next time
$this->jobList->add(LookupMissingGeoJob::class, []);
}
}
/** @var AddressService */
private $addressService;

/** @var AddressService */
private $jobList;

/**
* LookupMissingGeoJob constructor.
*
* A QueuedJob to lookup missing geo information of addresses
*
* @param AddressService $service
* @param IJobList $jobList
*/
public function __construct(ITimeFactory $timeFactory, AddressService $service, IJobList $jobList) {
parent::__construct($timeFactory);
$this->addressService = $service;
$this->jobList = $jobList;
}

public function run($arguments) {
\OC::$server->getLogger()->debug('Maps address lookup cronjob executed');
// lookup at most 200 addresses
if (!$this->addressService->lookupMissingGeo(200)) {
// if not all addresses where looked up successfully add a new job for next time
$this->jobList->add(LookupMissingGeoJob::class, []);
}
}
}
64 changes: 30 additions & 34 deletions lib/BackgroundJob/UpdatePhotoByFileJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,13 @@

namespace OCA\Maps\BackgroundJob;

use \OCP\BackgroundJob\QueuedJob;
use \OCP\BackgroundJob\IJobList;
use \OCP\AppFramework\Utility\ITimeFactory;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IUserManager;
use OCP\IConfig;
use OCP\Files\IRootFolder;

use OCA\Maps\Service\PhotofilesService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\QueuedJob;
use OCP\Files\IRootFolder;
use OCP\ICache;

use OCP\ICacheFactory;

class UpdatePhotoByFileJob extends QueuedJob {

Expand All @@ -38,35 +34,35 @@ class UpdatePhotoByFileJob extends QueuedJob {
/** @var ICache */
private ICache $backgroundJobCache;

/**
* UserInstallScanJob constructor.
*
* A QueuedJob to scan user storage for photos and tracks
*
* @param ITimeFactory $timeFactory
/**
* UserInstallScanJob constructor.
*
* A QueuedJob to scan user storage for photos and tracks
*
* @param ITimeFactory $timeFactory
* @param PhotofilesService $photofilesService
*/
public function __construct(ITimeFactory $timeFactory,
IRootFolder $root,
PhotofilesService $photofilesService,
ICacheFactory $cacheFactory) {
parent::__construct($timeFactory);
$this->photofilesService = $photofilesService;
$this->root = $root;
*/
public function __construct(ITimeFactory $timeFactory,
IRootFolder $root,
PhotofilesService $photofilesService,
ICacheFactory $cacheFactory) {
parent::__construct($timeFactory);
$this->photofilesService = $photofilesService;
$this->root = $root;
$this->cacheFactory = $cacheFactory;
$this->backgroundJobCache = $this->cacheFactory->createDistributed('maps:background-jobs');
}
}

public function run($arguments) {
$userFolder = $this->root->getUserFolder($arguments['userId']);
$files = $userFolder->getById($arguments['fileId']);
if (empty($files)) {
return;
}
$file = array_shift($files);
$this->photofilesService->updateByFileNow($file);
public function run($arguments) {
$userFolder = $this->root->getUserFolder($arguments['userId']);
$files = $userFolder->getById($arguments['fileId']);
if (empty($files)) {
return;
}
$file = array_shift($files);
$this->photofilesService->updateByFileNow($file);

$counter = $this->backgroundJobCache->get('recentlyUpdated:'.$arguments['userId']) ?? 0;
$this->backgroundJobCache->set('recentlyUpdated:'.$arguments['userId'], (int) $counter + 1, 60 * 60 * 3);
}
$this->backgroundJobCache->set('recentlyUpdated:'.$arguments['userId'], (int)$counter + 1, 60 * 60 * 3);
}
}
Loading

0 comments on commit b059d12

Please sign in to comment.