added more efficient fetching of converted file

CHANGES.txt

@@ -1,5 +1,8 @@
 Change List
 =========
+Version 3.1.76 (Build 2024040501)
+ - Delayed adhoc task temp file download until after we have fetched placeholder file records
+
 Version 3.1.75 (Build 2024040500)
  - Fixed missing ad-hoc task duplicate detection
 

classes/task/adhoc_s3_move.php

@@ -47,9 +47,21 @@ public function execute() {
 
         //get passed in data we need to perform conversion
         $cd = $this->get_custom_data();
-        $awsremote = new \filter_poodll\awsremote();
 
+        //fetch any file records, that currently hold the placeholder file
+        //usually just one, but occasionally there will be two (1 in draft, and 1 in perm)
+        //if there are none. The user may just not have saved yet
+        $placeholder_file_recs = \filter_poodll\poodlltools::fetch_placeholder_file_record($cd->mediatype, $cd->filename);
+        if (!$placeholder_file_recs) {
+            $giveup = false;
+            $message = 'could not find placeholder file:' . $cd->filename;
+            $this->handle_s3_error(self::LOG_PLACEHOLDER_NOT_FOUND, $message, $cd, $giveup, $trace);
+            return;
+        }
+
+        //fetch the file
         try {
+            $awsremote = new \filter_poodll\awsremote();
             $ret = $awsremote->fetch_s3_converted_file($cd->mediatype, $cd->infilename, $cd->outfilename, $cd->filename);
 
         } catch (\Exception $e) {
@@ -79,17 +91,7 @@ public function execute() {
             $tempfilepath = $ret;
         }
 
-        //fetch any file records, that currently hold the placeholder file
-        //usually just one, but occasionally there will be two (1 in draft, and 1 in perm)
-        $placeholder_file_recs = \filter_poodll\poodlltools::fetch_placeholder_file_record($cd->mediatype, $cd->filename);
-        //do the replace, if it succeeds yay. If it fails ... try again. The user may just not have saved yet
-        if (!$placeholder_file_recs) {
-            $giveup = false;
-            $message = 'could not find placeholder file:' . $cd->filename;
-            $this->handle_s3_error(self::LOG_PLACEHOLDER_NOT_FOUND, $message, $cd, $giveup, $trace);
-            return;
-        }
-
+        //do the replace
         try {
             foreach ($placeholder_file_recs as $file_rec) {
                 \filter_poodll\poodlltools::replace_placeholderfile_in_moodle($cd->filerecord, $file_rec, $tempfilepath);

version.php

@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024040500;
+$plugin->version = 2024040501;
 $plugin->requires = 2016052300;//moodle 3.1.0
 $plugin->component = 'filter_poodll';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = '3.1.75 (Build 2024040500)';
+$plugin->release = '3.1.76 (Build 2024040501)';