From b9f46baefcfaf2890dc3cfa5d1d7fe3f547f0e19 Mon Sep 17 00:00:00 2001 From: Khaled Lela Date: Mon, 8 May 2023 14:50:05 +0300 Subject: handle scorm with identifer --- src/Manager/ScormManager.php | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src/Manager/ScormManager.php') diff --git a/src/Manager/ScormManager.php b/src/Manager/ScormManager.php index d403d1e..bb502f4 100644 --- a/src/Manager/ScormManager.php +++ b/src/Manager/ScormManager.php @@ -42,16 +42,12 @@ class ScormManager public function uploadScormFromUri($file, $uuid = null) { // $uuid is meant for user to update scorm content. Hence, if user want to update content should parse in existing uuid - if (!empty($uuid)) - { + if (!empty($uuid)) { $this->uuid = $uuid; - } - else - { + } else { $this->uuid = Str::uuid(); } - $scorm = null; $this->scormDisk->readScormArchive($file, function ($path) use (&$scorm, $file, $uuid) { $filename = basename($file); @@ -69,12 +65,9 @@ class ScormManager public function uploadScormArchive(UploadedFile $file, $uuid = null) { // $uuid is meant for user to update scorm content. Hence, if user want to update content should parse in existing uuid - if (!empty($uuid)) - { + if (!empty($uuid)) { $this->uuid = $uuid; - } - else - { + } else { $this->uuid = Str::uuid(); } @@ -117,8 +110,7 @@ class ScormManager } // This uuid is use when the admin wants to edit existing scorm file. - if (!empty($uuid)) - { + if (!empty($uuid)) { $this->uuid = $uuid; // Overwrite system generated uuid } @@ -136,8 +128,11 @@ class ScormManager * Handle dynamic method calls into the method. * return $this->dynamicWhere($method, $parameters); **/ + + $scorm = ScormModel::whereOriginFile($filename); + // Uuid indicator is better than filename for update content or add new content. - $scorm = ScormModel::whereUuid($this->uuid); + // $scorm = ScormModel::whereUuid($this->uuid); // Check if scom package already exists to drop old one. if (!$scorm->exists()) { @@ -608,7 +603,8 @@ class ScormManager $tracking->setLessonStatus($lessonStatus); $bestStatus = $lessonStatus; - if (empty($tracking->getCompletionStatus()) + if ( + empty($tracking->getCompletionStatus()) || ($completionStatus !== $tracking->getCompletionStatus() && $statusPriority[$completionStatus] > $statusPriority[$tracking->getCompletionStatus()]) ) { // This is no longer needed as completionStatus and successStatus are merged together @@ -656,7 +652,8 @@ class ScormManager return $updateResult; } - public function resetUserData($scormId, $userId) { + public function resetUserData($scormId, $userId) + { $scos = ScormScoModel::where('scorm_id', $scormId)->get(); foreach ($scos as $sco) { -- cgit v1.2.3 From c8c335715f653fc67282aaa78892ba06133732a2 Mon Sep 17 00:00:00 2001 From: Khaled Lela Date: Mon, 8 May 2023 14:57:34 +0300 Subject: handle scorm with uuid --- src/Manager/ScormManager.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Manager/ScormManager.php') diff --git a/src/Manager/ScormManager.php b/src/Manager/ScormManager.php index bb502f4..cf9587c 100644 --- a/src/Manager/ScormManager.php +++ b/src/Manager/ScormManager.php @@ -128,11 +128,9 @@ class ScormManager * Handle dynamic method calls into the method. * return $this->dynamicWhere($method, $parameters); **/ - - $scorm = ScormModel::whereOriginFile($filename); - + // $scorm = ScormModel::whereOriginFile($filename); // Uuid indicator is better than filename for update content or add new content. - // $scorm = ScormModel::whereUuid($this->uuid); + $scorm = ScormModel::whereUuid($this->uuid); // Check if scom package already exists to drop old one. if (!$scorm->exists()) { -- cgit v1.2.3 From 70f8710355ec0a91d279b12a2c0e74083dc6e7b6 Mon Sep 17 00:00:00 2001 From: Khaled Lela Date: Mon, 8 May 2023 14:58:54 +0300 Subject: update where uuid --- src/Manager/ScormManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Manager/ScormManager.php') diff --git a/src/Manager/ScormManager.php b/src/Manager/ScormManager.php index cf9587c..2dcaa5e 100644 --- a/src/Manager/ScormManager.php +++ b/src/Manager/ScormManager.php @@ -130,7 +130,7 @@ class ScormManager **/ // $scorm = ScormModel::whereOriginFile($filename); // Uuid indicator is better than filename for update content or add new content. - $scorm = ScormModel::whereUuid($this->uuid); + $scorm = ScormModel::where('uuid', $this->uuid); // Check if scom package already exists to drop old one. if (!$scorm->exists()) { -- cgit v1.2.3 From 924c72de0af5fd00ae171189788b8a713472afba Mon Sep 17 00:00:00 2001 From: Khaled Lela Date: Thu, 14 Aug 2025 13:10:00 +0300 Subject: Enhance SCORM file handling with improved error logging and validation. Added checks for disk accessibility and file existence in readScormArchive method. Updated uuid assignment logic in uploadScormFromUri and uploadScormArchive methods. --- src/Manager/ScormManager.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Manager/ScormManager.php') diff --git a/src/Manager/ScormManager.php b/src/Manager/ScormManager.php index 2dcaa5e..abf1e26 100644 --- a/src/Manager/ScormManager.php +++ b/src/Manager/ScormManager.php @@ -42,12 +42,16 @@ class ScormManager public function uploadScormFromUri($file, $uuid = null) { // $uuid is meant for user to update scorm content. Hence, if user want to update content should parse in existing uuid - if (!empty($uuid)) { - $this->uuid = $uuid; - } else { - $this->uuid = Str::uuid(); + $this->uuid = $uuid ?? Str::uuid()->toString(); + + // Validate that the file parameter is not empty + if (empty($file)) { + throw new InvalidScormArchiveException('file_parameter_empty'); } + // Log the file being processed for debugging + \Log::info('Uploading SCORM from URI: ' . $file); + $scorm = null; $this->scormDisk->readScormArchive($file, function ($path) use (&$scorm, $file, $uuid) { $filename = basename($file); @@ -65,11 +69,7 @@ class ScormManager public function uploadScormArchive(UploadedFile $file, $uuid = null) { // $uuid is meant for user to update scorm content. Hence, if user want to update content should parse in existing uuid - if (!empty($uuid)) { - $this->uuid = $uuid; - } else { - $this->uuid = Str::uuid(); - } + $this->uuid = $uuid ?? Str::uuid()->toString(); return $this->saveScorm($file, $file->getClientOriginalName(), $uuid); } @@ -401,7 +401,7 @@ class ScormManager 'user_id' => $userId, 'sco_id' => $sco->id ], [ - 'uuid' => Str::uuid(), + 'uuid' => Str::uuid()->toString(), 'progression' => $scoTracking->getProgression(), 'score_raw' => $scoTracking->getScoreRaw(), 'score_min' => $scoTracking->getScoreMin(), -- cgit v1.2.3