failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(vikon): simplify syncFiles - just overwrite, no backups or deletes

Browse Source
This commit is contained in:
F4ilji
2026-07-04 19:11:25 +05:00
parent 93bd3963bf
commit 13df1c3a64
1 changed files with 5 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Containers/VikonIntegration/Actions/UpdateCoreAction.php
+5 -51
View File
@@ -10,9 +10,6 @@ use ZipArchive;
class UpdateCoreAction class UpdateCoreAction
{ {
private const NEW_SUFFIX = '_new';
private const OLD_SUFFIX = '_old';
public function __construct( public function __construct(
private readonly HttpTask $http, private readonly HttpTask $http,
private readonly FilesystemTask $fs, private readonly FilesystemTask $fs,
@@ -62,7 +59,6 @@ class UpdateCoreAction
File::delete($zipFile); File::delete($zipFile);
$this->syncFiles($tempPath, $modulePath); $this->syncFiles($tempPath, $modulePath);
$this->cleanModule($modulePath, $config['allowed_folders']);
File::put($modulePath . '/.vikon', date('Y-m-d H:i:s')); File::put($modulePath . '/.vikon', date('Y-m-d H:i:s'));
File::deleteDirectory($tempPath); File::deleteDirectory($tempPath);
@@ -71,7 +67,7 @@ class UpdateCoreAction
} catch (\Throwable $e) { } catch (\Throwable $e) {
Log::error('Vikon update failed', ['module' => $moduleId, 'error' => $e->getMessage()]); Log::error('Vikon update failed', ['module' => $moduleId, 'error' => $e->getMessage()]);
$this->rollback($modulePath); File::deleteDirectory($tempPath);
throw new \RuntimeException('Ошибка обновления: ' . $e->getMessage()); throw new \RuntimeException('Ошибка обновления: ' . $e->getMessage());
} }
} }
@@ -116,12 +112,6 @@ class UpdateCoreAction
foreach (File::files($source) as $file) { foreach (File::files($source) as $file) {
$name = $file->getFilename(); $name = $file->getFilename();
$targetPath = $target . '/' . $name; $targetPath = $target . '/' . $name;
if (File::exists($targetPath)) {
$oldPath = $targetPath . self::OLD_SUFFIX;
@unlink($oldPath);
rename($targetPath, $oldPath);
}
rename($file->getPathname(), $targetPath); rename($file->getPathname(), $targetPath);
} }
@@ -129,46 +119,10 @@ class UpdateCoreAction
$name = basename($dir); $name = basename($dir);
$targetPath = $target . '/' . $name; $targetPath = $target . '/' . $name;
if (File::exists($targetPath)) { if (!File::isDirectory($targetPath)) {
$oldPath = $targetPath . self::OLD_SUFFIX; rename($dir, $targetPath);
$this->fs->safeRemove($oldPath, $target, true); } else {
rename($targetPath, $oldPath); $this->syncFiles($dir, $targetPath);
}
rename($dir, $targetPath);
}
}
private function cleanModule(string $modulePath, array $allowed): void
{
foreach (File::directories($modulePath) as $dir) {
$name = basename($dir);
if (!in_array($name, $allowed, true) && !is_link($dir)) {
File::deleteDirectory($dir);
}
}
foreach (File::files($modulePath) as $file) {
$name = $file->getFilename();
if (!in_array($name, $allowed, true) && !in_array($name, ['.vikon', '.htaccess'], true)) {
File::delete($file);
}
}
}
private function rollback(string $modulePath): void
{
foreach (File::directories($modulePath) as $dir) {
$old = $dir . self::OLD_SUFFIX;
if (File::exists($old)) {
File::deleteDirectory($dir);
File::move($old, $dir);
}
}
foreach (File::files($modulePath) as $file) {
$old = $file->getPathname() . self::OLD_SUFFIX;
if (File::exists($old)) {
File::delete($file);
rename($old, $file->getPathname());
} }
} }
} }