Bugfix: modifying a file could result in a broken symlink in the LZ

gboudreau · Feb 21, 2022 · ed682e1 · ed682e1
1 parent b062f15
commit ed682e1
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/includes/Tasks/WriteTask.php b/includes/Tasks/WriteTask.php
@@ -31,16 +31,12 @@ public function execute() {
         }
 
         if (string_starts_with($this->additional_info, 'source:')) {
-            $source_file = substr($this->additional_info, 7);
-        } else {
-            $source_file = "$landing_zone/$full_path";
-        }
-
-        if ($this->should_ignore_file() && !string_starts_with($this->additional_info, 'source:')) {
+            $source_file = substr( $this->additional_info, 7 );
+        } elseif ($this->should_ignore_file()) {
             return TRUE;
         }
 
-        if (!gh_file_exists($source_file, '$real_path doesn\'t exist anymore.')) {
+        if (!gh_file_exists(!empty($source_file) ? $source_file : "$landing_zone/$full_path", '$real_path doesn\'t exist anymore.')) {
             $new_full_path = static::find_future_full_path($share, $full_path, $task_id);
             if ($new_full_path != $full_path && gh_is_file("$landing_zone/$new_full_path")) {
                 Log::debug("  Found that $full_path has been renamed to $new_full_path. Will work using that instead.");