Skip to content

Refactor makeModelFromContract on assets and containers #297

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

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Refactor makeModelFromContract on assets and containers #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public function writeMeta($meta)
{
$meta['data'] = Arr::removeNullValues($meta['data']);

self::makeModelFromContract($this, $meta);
self::makeModelFromContract($this, $meta)?->save();

Blink::put('eloquent-asset-meta-exists-'.$this->id(), true);
}
Expand Down Expand Up @@ -166,8 +166,6 @@ public static function makeModelFromContract(AssetContract $source, $meta = [])
$model->updated_at = $meta['last_modified'];
}

$model->save();

return $model;
}

Expand Down
20 changes: 1 addition & 19 deletions src/Assets/AssetContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,7 @@ public function fillFromModel(Model $model)

public function toModel()
{
$class = app('statamic.eloquent.assets.container_model');

return $class::firstOrNew(['handle' => $this->handle()])->fill([
'title' => $this->title(),
'disk' => $this->diskHandle() ?? config('filesystems.default'),
'settings' => [
'allow_uploads' => $this->allowUploads(),
'allow_downloading' => $this->allowDownloading(),
'allow_moving' => $this->allowMoving(),
'allow_renaming' => $this->allowRenaming(),
'create_folders' => $this->createFolders(),
'search_index' => $this->searchIndex(),
'source_preset' => $this->sourcePreset,
'warm_presets' => $this->warmPresets,
'validation_rules' => $this->validationRules(),
],
]);
return self::makeModelFromContract($this);
}

public static function makeModelFromContract(AssetContainerContract $source)
Expand All @@ -103,8 +87,6 @@ public static function makeModelFromContract(AssetContainerContract $source)
$model->updated_at = $source->fileLastModified();
}

$model->save();

return $model;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Commands/ImportAssets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private function importAssetContainers(): void
}

$this->withProgressBar(AssetContainerFacade::all(), function ($container) {
AssetContainer::makeModelFromContract($container);
AssetContainer::makeModelFromContract($container)?->save();
});

$this->components->info('Assets containers imported sucessfully');
Expand All @@ -83,7 +83,7 @@ private function importAssets(): void
}

$this->withProgressBar(AssetFacade::all(), function ($asset) {
EloquentAsset::makeModelFromContract($asset);
EloquentAsset::makeModelFromContract($asset)?->save();
});

$this->components->info('Assets imported sucessfully');
Expand Down