Skip to content

ファイルに拡張子オプションを付与 #34

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
Jul 10, 2017
Merged

ファイルに拡張子オプションを付与 #34

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
8 changes: 6 additions & 2 deletions src/Controller/Traits/NormalContentsFileControllerTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,14 @@ private function normalTmpFilePath($filename)
*/
private function normalFilePath($attachmentData)
{
$ext = '';
if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = '.' . (new \SplFileInfo($attachmentData->file_name))->getExtension();
}
if (Configure::read('ContentsFile.Setting.randomFile') === true && $attachmentData->file_random_path != '') {
return Configure::read('ContentsFile.Setting.Normal.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->file_random_path;
return Configure::read('ContentsFile.Setting.Normal.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->file_random_path . $ext;
} else {
return Configure::read('ContentsFile.Setting.Normal.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->field_name;
return Configure::read('ContentsFile.Setting.Normal.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->field_name . $ext;
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/Controller/Traits/S3ContentsFileControllerTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,14 @@ private function s3TmpFilePath($filename)
*/
private function s3FilePath($attachmentData)
{
$ext = '';
if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = '.' . (new \SplFileInfo($attachmentData->file_name))->getExtension();
}
if (Configure::read('ContentsFile.Setting.randomFile') === true && $attachmentData->file_random_path != '') {
return Configure::read('ContentsFile.Setting.S3.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->file_random_path;
return Configure::read('ContentsFile.Setting.S3.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->file_random_path . $ext;
} else {
return Configure::read('ContentsFile.Setting.S3.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->field_name;
return Configure::read('ContentsFile.Setting.S3.fileDir') . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->field_name . $ext;
}
}

Expand Down
8 changes: 7 additions & 1 deletion src/Model/Behavior/Traits/ImageContentsFileBehaviorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace ContentsFile\Model\Behavior\Traits;

use Cake\Core\Configure;

/**
* ImageContentsFileBehaviorTrait
* 画像関係の処理
Expand Down Expand Up @@ -174,7 +176,7 @@ private function imageResizeMake($image, $imagetype, $imagePath, $baseSize, $ima
default:
break;
}

$diffX = 0;
$diffY = 0;
// くりぬきの場合(幅と高さが両方必要)
Expand Down Expand Up @@ -241,6 +243,10 @@ public function getPathInfo($imagePath, $resize = []) {
$resize['type'] = 'normal';
}
$pathinfo['resize_filepath'] = $pathinfo['resize_dir'] . '/' . $resize['width'] . '_' . $resize['height'] . '_' . $resize['type'];
if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = (new \SplFileInfo($imagePath))->getExtension();
$pathinfo['resize_filepath'] .= '.' . $ext;
}
}
return $pathinfo;
}
Expand Down
9 changes: 9 additions & 0 deletions src/Model/Behavior/Traits/NormalContentsFileBehaviorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ private function normalFileSave($fileInfo, $fieldSettings, $attachmentSaveData)
$newFilepath = $newFiledir . $fileInfo['field_name'];
}

if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = (new \SplFileInfo($attachmentSaveData['file_name']))->getExtension();
$newFilepath .= '.' . $ext;
}

//元ファイルは削除する
$this->normalFileDelete($attachmentSaveData['model'], $attachmentSaveData['model_id'], $fileInfo['field_name']);

Expand Down Expand Up @@ -118,6 +123,10 @@ private function normalFileDelete($modelName, $modelId, $field)

// 大元のファイル
$deleteFile = Configure::read('ContentsFile.Setting.Normal.fileDir') . $modelName . '/' . $modelId . '/' . $deleteField;
if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = (new \SplFileInfo($attachmentData->file_name))->getExtension();
$deleteFile .= '.' . $ext;
}
if (file_exists($deleteFile) && !unlink($deleteFile)) {
return false;
}
Expand Down
8 changes: 8 additions & 0 deletions src/Model/Behavior/Traits/S3ContentsFileBehaviorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ private function s3FileSave($fileInfo, $fieldSettings, $attachmentSaveData)
} else {
$newFilepath = $newFiledir . $fileInfo['field_name'];
}
if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = (new \SplFileInfo($attachmentSaveData['file_name']))->getExtension();
$newFilepath .= '.' . $ext;
}
$oldFilepath = Configure::read('ContentsFile.Setting.S3.tmpDir') . $fileInfo['tmp_file_name'];

// 該当ファイルを消す
Expand Down Expand Up @@ -129,6 +133,10 @@ private function s3FileDelete($modelName, $modelId, $field)

// 大元のファイル
$deleteFile = Configure::read('ContentsFile.Setting.S3.fileDir') . $modelName . '/' . $modelId . '/' . $deleteField;
if (Configure::read('ContentsFile.Setting.ext') === true) {
$ext = (new \SplFileInfo($attachmentData->file_name))->getExtension();
$deleteFile .= '.' . $ext;
}
if (!$S3->delete($deleteFile)) {
return false;
}
Expand Down