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/ScormDisk.php | 67 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 8 deletions(-) (limited to 'src/Manager/ScormDisk.php') diff --git a/src/Manager/ScormDisk.php b/src/Manager/ScormDisk.php index 99988af..47fd3eb 100644 --- a/src/Manager/ScormDisk.php +++ b/src/Manager/ScormDisk.php @@ -47,16 +47,35 @@ class ScormDisk public function readScormArchive($file, callable $fn) { try { + $archiveDisk = $this->getArchiveDisk(); + + // Log the file path being processed for debugging + Log::info('Processing SCORM archive file: ' . $file); + + // Check if file exists on archive disk + if (!$archiveDisk->exists($file)) { + Log::error('File not found on archive disk: ' . $file); + throw new StorageNotFoundException('scorm_archive_not_found_on_archive_disk: ' . $file); + } + + // Get the stream from archive disk + $stream = $archiveDisk->readStream($file); + if (!is_resource($stream)) { + Log::error('Failed to read stream from archive disk for file: ' . $file . '. Stream type: ' . gettype($stream)); + throw new StorageNotFoundException('failed_to_read_scorm_archive_stream: ' . $file); + } + if (Storage::exists($file)) { Storage::delete($file); } - Storage::writeStream($file, $this->getArchiveDisk()->readStream($file)); + + Storage::writeStream($file, $stream); $path = Storage::path($file); call_user_func($fn, $path); // Clean local resources $this->clean($file); } catch (Exception $ex) { - Log::error($ex->getMessage()); + Log::error('Error in readScormArchive: ' . $ex->getMessage() . ' for file: ' . $file); throw new StorageNotFoundException('scorm_archive_not_found'); } } @@ -132,10 +151,26 @@ class ScormDisk */ private function getDisk() { - if (!config()->has('filesystems.disks.' . config('scorm.disk'))) { - throw new StorageNotFoundException('scorm_disk_not_define'); + $diskName = config('scorm.disk'); + if (empty($diskName)) { + throw new StorageNotFoundException('scorm_disk_not_configured'); } - return Storage::disk(config('scorm.disk')); + + if (!config()->has('filesystems.disks.' . $diskName)) { + throw new StorageNotFoundException('scorm_disk_not_define: ' . $diskName); + } + + $disk = Storage::disk($diskName); + + // Test if the disk is accessible + try { + $disk->exists('test'); + } catch (Exception $ex) { + Log::error('SCORM disk not accessible: ' . $ex->getMessage()); + throw new StorageNotFoundException('scorm_disk_not_accessible: ' . $diskName); + } + + return $disk; } /** @@ -143,9 +178,25 @@ class ScormDisk */ private function getArchiveDisk() { - if (!config()->has('filesystems.disks.' . config('scorm.archive'))) { - throw new StorageNotFoundException('scorm_archive_disk_not_define'); + $archiveDiskName = config('scorm.archive'); + if (empty($archiveDiskName)) { + throw new StorageNotFoundException('scorm_archive_disk_not_configured'); + } + + if (!config()->has('filesystems.disks.' . $archiveDiskName)) { + throw new StorageNotFoundException('scorm_archive_disk_not_define: ' . $archiveDiskName); + } + + $disk = Storage::disk($archiveDiskName); + + // Test if the disk is accessible + try { + $disk->exists('test'); + } catch (Exception $ex) { + Log::error('Archive disk not accessible: ' . $ex->getMessage()); + throw new StorageNotFoundException('scorm_archive_disk_not_accessible: ' . $archiveDiskName); } - return Storage::disk(config('scorm.archive')); + + return $disk; } } -- cgit v1.2.3 From e43bcd1830be760ee2b05c559c661710d107d826 Mon Sep 17 00:00:00 2001 From: Khaled Lela Date: Thu, 14 Aug 2025 14:41:34 +0300 Subject: Refactor SCORM disk handling by removing redundant disk accessibility checks and cleaning up whitespace. This improves code readability and maintains existing functionality. --- src/Manager/ScormDisk.php | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) (limited to 'src/Manager/ScormDisk.php') diff --git a/src/Manager/ScormDisk.php b/src/Manager/ScormDisk.php index 47fd3eb..5b71904 100644 --- a/src/Manager/ScormDisk.php +++ b/src/Manager/ScormDisk.php @@ -48,27 +48,27 @@ class ScormDisk { try { $archiveDisk = $this->getArchiveDisk(); - + // Log the file path being processed for debugging Log::info('Processing SCORM archive file: ' . $file); - + // Check if file exists on archive disk if (!$archiveDisk->exists($file)) { Log::error('File not found on archive disk: ' . $file); throw new StorageNotFoundException('scorm_archive_not_found_on_archive_disk: ' . $file); } - + // Get the stream from archive disk $stream = $archiveDisk->readStream($file); if (!is_resource($stream)) { Log::error('Failed to read stream from archive disk for file: ' . $file . '. Stream type: ' . gettype($stream)); throw new StorageNotFoundException('failed_to_read_scorm_archive_stream: ' . $file); } - + if (Storage::exists($file)) { Storage::delete($file); } - + Storage::writeStream($file, $stream); $path = Storage::path($file); call_user_func($fn, $path); @@ -155,21 +155,13 @@ class ScormDisk if (empty($diskName)) { throw new StorageNotFoundException('scorm_disk_not_configured'); } - + if (!config()->has('filesystems.disks.' . $diskName)) { throw new StorageNotFoundException('scorm_disk_not_define: ' . $diskName); } - + $disk = Storage::disk($diskName); - - // Test if the disk is accessible - try { - $disk->exists('test'); - } catch (Exception $ex) { - Log::error('SCORM disk not accessible: ' . $ex->getMessage()); - throw new StorageNotFoundException('scorm_disk_not_accessible: ' . $diskName); - } - + return $disk; } @@ -182,21 +174,13 @@ class ScormDisk if (empty($archiveDiskName)) { throw new StorageNotFoundException('scorm_archive_disk_not_configured'); } - + if (!config()->has('filesystems.disks.' . $archiveDiskName)) { throw new StorageNotFoundException('scorm_archive_disk_not_define: ' . $archiveDiskName); } - + $disk = Storage::disk($archiveDiskName); - - // Test if the disk is accessible - try { - $disk->exists('test'); - } catch (Exception $ex) { - Log::error('Archive disk not accessible: ' . $ex->getMessage()); - throw new StorageNotFoundException('scorm_archive_disk_not_accessible: ' . $archiveDiskName); - } - + return $disk; } } -- cgit v1.2.3 From 1813b3a3ecca7e7bc1e9ae9d1baf1b559a70168b Mon Sep 17 00:00:00 2001 From: Khaled Lela Date: Thu, 14 Aug 2025 15:28:11 +0300 Subject: Refactor error handling in readScormArchive method to throw the original exception instead of a custom StorageNotFoundException --- src/Manager/ScormDisk.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Manager/ScormDisk.php') diff --git a/src/Manager/ScormDisk.php b/src/Manager/ScormDisk.php index 5b71904..41de387 100644 --- a/src/Manager/ScormDisk.php +++ b/src/Manager/ScormDisk.php @@ -76,7 +76,7 @@ class ScormDisk $this->clean($file); } catch (Exception $ex) { Log::error('Error in readScormArchive: ' . $ex->getMessage() . ' for file: ' . $file); - throw new StorageNotFoundException('scorm_archive_not_found'); + throw $ex; } } -- cgit v1.2.3