From 878362c0f34c5240871dc2eb6cc26b35fedd89bf Mon Sep 17 00:00:00 2001 From: Devian Date: Fri, 30 Apr 2021 12:14:25 +0800 Subject: Update path --- config/scorm.php | 3 --- src/Manager/ScormManager.php | 11 +++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config/scorm.php b/config/scorm.php index 7b5a2f0..e5efb3f 100644 --- a/config/scorm.php +++ b/config/scorm.php @@ -10,7 +10,4 @@ return [ ], // Scorm directory. You may create a custom path in file system 'disk' => 'local', - // Path to generated scorm folder. (Eg: path/scorm-folder/{generated hashname folder}/{scomfiles} - 'upload_path' => 'scorm-folder/', - ]; diff --git a/src/Manager/ScormManager.php b/src/Manager/ScormManager.php index 7813ad6..30d0322 100644 --- a/src/Manager/ScormManager.php +++ b/src/Manager/ScormManager.php @@ -162,8 +162,15 @@ class ScormManager throw new StorageNotFoundException(); } - $rootFolder = config('filesystems.disks.'.config('scorm.disk').'.root').'/'; - $destinationDir = config('scorm.upload_path').$hashName; // file path + + $rootFolder = config('filesystems.disks.'.config('scorm.disk').'.root'); + + if (substr($rootFolder, -1) != '/') { + // If end with xxx/ + $rootFolder = config('filesystems.disks.'.config('scorm.disk').'.root').'/'; + } + + $destinationDir = $rootFolder.$hashName; // file path if (!File::isDirectory($rootFolder.$destinationDir)) { File::makeDirectory($rootFolder.$destinationDir, 0755, true, true); -- cgit v1.2.3