bitinflow/bunny-cli
1
0
Fork 0
mirror of https://github.com/bitinflow/bunny-cli.git synced 2026-03-15 22:55:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve command options

Browse Source
This commit is contained in:
René Preuß
2021-07-22 17:41:53 +02:00
parent 4b9e117f1a
commit e05b6e3801
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Bunny/Filesystem/CompareOptions.php
View File

@@ -7,8 +7,8 @@ namespace App\Bunny\Filesystem;
class CompareOptions class CompareOptions
{ {
const START = 'start'; const START = 'start';
const NO_SHA256_VERIFICATION = 'no_sha256_verification'; const NO_LOCK_VERIFICATION = 'no_lock_verification';
const NO_SHA256_GENERATION = 'no_sha256_generation'; const NO_LOCK_GENERATION = 'no_lock_generation';
const LOCK_FILE = 'lock_file'; const LOCK_FILE = 'lock_file';
const DRY_RUN = 'dry-run'; const DRY_RUN = 'dry_run';
} }

9
app/Bunny/Filesystem/FileCompare.php
View File

@@ -12,7 +12,10 @@ use Illuminate\Console\Command;
class FileCompare class FileCompare
{ {
private const RESERVED_FILENAMES = []; private const RESERVED_FILENAMES = [
'/.well-known',
'/.well-known/bunny-cli.lock',
];
private LocalStorage $localStorage; private LocalStorage $localStorage;
private EdgeStorage $edgeStorage; private EdgeStorage $edgeStorage;
@@ -109,7 +112,7 @@ class FileCompare
} }
} }
if (!$options[CompareOptions::NO_SHA256_GENERATION]) { if (!$options[CompareOptions::NO_LOCK_GENERATION]) {
$this->command->info('- Generating cache for current deployment...'); $this->command->info('- Generating cache for current deployment...');
if (!$this->edgeStorage->getStorageCache()->save($local, $edge, $localFilesAndDirectories)) { if (!$this->edgeStorage->getStorageCache()->save($local, $edge, $localFilesAndDirectories)) {
@@ -170,7 +173,7 @@ class FileCompare
{ {
$this->edgeStorage->getStorageCache()->setFilename($options[CompareOptions::LOCK_FILE]); $this->edgeStorage->getStorageCache()->setFilename($options[CompareOptions::LOCK_FILE]);
if ($options[CompareOptions::NO_SHA256_VERIFICATION]) { if ($options[CompareOptions::NO_LOCK_VERIFICATION]) {
return $this->getAllFilesRecursive($expectedMax, $edge); return $this->getAllFilesRecursive($expectedMax, $edge);
} }

8
app/Commands/DeployCommand.php
View File

@@ -19,8 +19,8 @@ class DeployCommand extends Command
*/ */
protected $signature = 'deploy protected $signature = 'deploy
{--dir=dist : Root directory to upload} {--dir=dist : Root directory to upload}
{--no-sha256-verification : Skips checksum verification from bunny-cli.lock and polls the storage api recursively instead} {--no-lock-verification : Skips checksum verification from bunny-cli.lock and polls the storage api recursively instead}
{--no-sha256-generation : Skips checksum generation for bunny-cli.lock} {--no-lock-generation : Skips generation of .well-known/bunny-cli.lock}
{--lock-file=.well-known/bunny-cli.lock : Changes the location and filename of .well-known/bunny-cli.lock} {--lock-file=.well-known/bunny-cli.lock : Changes the location and filename of .well-known/bunny-cli.lock}
{--dry-run : Outputs the operations but will not execute anything}'; {--dry-run : Outputs the operations but will not execute anything}';
@@ -62,8 +62,8 @@ class DeployCommand extends Command
try { try {
$fileCompare->compare($localPath, $edgePath, [ $fileCompare->compare($localPath, $edgePath, [
CompareOptions::START => $start, CompareOptions::START => $start,
CompareOptions::NO_SHA256_VERIFICATION => $this->option('no-sha256-verification'), CompareOptions::NO_LOCK_VERIFICATION => $this->option('no-lock-verification'),
CompareOptions::NO_SHA256_GENERATION => $this->option('no-sha256-generation'), CompareOptions::NO_LOCK_GENERATION => $this->option('no-lock-generation'),
CompareOptions::LOCK_FILE => $this->option('lock-file'), CompareOptions::LOCK_FILE => $this->option('lock-file'),
CompareOptions::DRY_RUN => $this->option('dry-run'), CompareOptions::DRY_RUN => $this->option('dry-run'),
]); ]);