nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reformat code

Browse source 
- Reformat Console\Storage
- Reformat Core\StorageManager
- Simplify logic in Worker\CronJobs
This commit is contained in:
Hypolite Petovan 2019-03-17 19:04:42 -04:00
parent 3a0a6cd659
commit f225a6c51a
3 changed files with 44 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Core/Console/Storage.php
View file

@ -49,36 +49,36 @@ HELP;
return -1;
}
switch($this->args[0]) {
case 'list':
return $this->do_list();
break;
case 'set':
return $this->do_set();
break;
case 'move':
return $this->do_move();
break;
switch ($this->args[0]) {
case 'list':
return $this->doList();
break;
case 'set':
return $this->doSet();
break;
case 'move':
return $this->doMove();
break;
}
$this->out(sprintf('Invalid action "%s"', $this->args[0]));
return -1;
}
protected function do_list()
protected function doList()
{
$rowfmt = ' %-3s | %-20s';
$current = StorageManager::getBackend();
$this->out(sprintf($rowfmt, 'Sel', 'Name'));
$this->out('-----------------------');
$isregisterd = false;
foreach(StorageManager::listBackends() as $name => $class) {
foreach (StorageManager::listBackends() as $name => $class) {
$issel = ' ';
if ($current === $class) {
$issel = '*';
$isregisterd = true;
};
$this->out(sprintf($rowfmt, $issel , $name ));
$this->out(sprintf($rowfmt, $issel, $name));
}
if ($current === '') {
@ -92,7 +92,7 @@ HELP;
return 0;
}
protected function do_set()
protected function doSet()
{
if (count($this->args) !== 2) {
throw new CommandArgsException('Invalid arguments');
@ -110,7 +110,7 @@ HELP;
return 0;
}
protected function do_move()
protected function doMove()
{
$tables = null;
if (count($this->args) < 1 || count($this->args) > 2) {

2
src/Core/StorageManager.php
View file

@ -23,7 +23,7 @@ class StorageManager
private static function setup()
{
if (count(self::$backends)==0) {
if (count(self::$backends) == 0) {
self::$backends = Config::get('storage', 'backends', self::$default_backends);
}
}

68
src/Worker/CronJobs.php
View file

@ -35,54 +35,42 @@ class CronJobs
Logger::log("Starting cronjob " . $command, Logger::DEBUG);
// Call possible post update functions
// see src/Database/PostUpdate.php for more details
if ($command == 'post_update') {
PostUpdate::update();
return;
}
switch($command) {
case 'post_update':
PostUpdate::update();
break;
// update nodeinfo data
if ($command == 'nodeinfo') {
nodeinfo_cron();
return;
}
case 'nodeinfo':
nodeinfo_cron();
break;
// Expire and remove user entries
if ($command == 'expire_and_remove_users') {
self::expireAndRemoveUsers();
return;
}
case 'expire_and_remove_users':
self::expireAndRemoveUsers();
break;
if ($command == 'update_contact_birthdays') {
Contact::updateBirthdays();
return;
}
case 'update_contact_birthdays':
Contact::updateBirthdays();
break;
if ($command == 'update_photo_albums') {
self::updatePhotoAlbums();
return;
}
case 'update_photo_albums':
self::updatePhotoAlbums();
break;
// Clear cache entries
if ($command == 'clear_cache') {
self::clearCache($a);
return;
}
case 'clear_cache':
self::clearCache($a);
break;
// Repair missing Diaspora values in contacts
if ($command == 'repair_diaspora') {
self::repairDiaspora($a);
return;
}
case 'repair_diaspora':
self::repairDiaspora($a);
break;
// Repair entries in the database
if ($command == 'repair_database') {
self::repairDatabase();
return;
}
case 'repair_database':
self::repairDatabase();
break;
Logger::log("Xronjob " . $command . " is unknown.", Logger::DEBUG);
default:
Logger::log("Xronjob " . $command . " is unknown.", Logger::DEBUG);
}
return;
}