Merge pull request #516 from jrchamp/fix/recordingtype-should-be-code

recordings: use type codes, not language strings
ncstate-delta · Sep 7, 2023 · 3e3468c · 3e3468c
2 parents 27d438e + 2c8b636
commit 3e3468c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/classes/task/get_meeting_recordings.php b/classes/task/get_meeting_recordings.php
@@ -73,6 +73,11 @@ public function execute() {
 
         mtrace('Finding meeting recordings for this account...');
 
+        $recordingtypestrings = [
+            'audio' => get_string('recordingtypeaudio', 'mod_zoom'),
+            'video' => get_string('recordingtypevideo', 'mod_zoom'),
+        ];
+
         $zoommeetings = zoom_get_all_meeting_records();
         foreach ($zoommeetings as $zoom) {
             // Only get recordings for this meeting if its recurring or already finished.
@@ -91,14 +96,16 @@ public function execute() {
                                 continue;
                             }
 
+                            $recordingtypestring = $recordingtypestrings[$zoomrecordinginfo->recordingtype];
+
                             $rec = new \stdClass();
                             $rec->zoomid = $zoom->id;
                             $rec->meetinguuid = trim($zoomrecordinginfo->meetinguuid);
                             $rec->zoomrecordingid = trim($zoomrecordinginfo->recordingid);
-                            $rec->name = trim($zoom->name) . ' (' . trim($zoomrecordinginfo->recordingtype) . ')';
+                            $rec->name = trim($zoom->name) . ' (' . $recordingtypestring . ')';
                             $rec->externalurl = $zoomrecordinginfo->url;
                             $rec->passcode = trim($zoomrecordinginfo->passcode);
-                            $rec->recordingtype = trim($zoomrecordinginfo->recordingtype);
+                            $rec->recordingtype = $zoomrecordinginfo->recordingtype;
                             $rec->recordingstart = $recordingstarttime;
                             $rec->showrecording = $zoom->recordings_visible_default;
                             $rec->timecreated = $now;

diff --git a/classes/webservice.php b/classes/webservice.php
@@ -970,16 +970,16 @@ public function get_recording_url_list($meetingid) {
                 $settingsresponse = $this->make_call($settingsurl);
                 foreach ($response->recording_files as $rec) {
                     if (!empty($rec->play_url) && in_array($rec->file_type, $allowedrecordingtypes, true)) {
+                        $type = (!empty($rec->recording_type) && $rec->recording_type === 'audio_only') ? 'audio' : 'video';
+
                         // Only pick the video recording and audio only recordings.
                         // The transcript is available in both of these, so the extra file is unnecessary.
                         $recordinginfo = new stdClass();
                         $recordinginfo->recordingid = $rec->id;
                         $recordinginfo->meetinguuid = $rec->meeting_id;
                         $recordinginfo->url = $rec->play_url;
                         $recordinginfo->filetype = $rec->file_type;
-                        $recordinginfo->recordingtype = (!empty($rec->recording_type) && $rec->recording_type === 'audio_only') ?
-                            get_string('recordingtypeaudio', 'mod_zoom') :
-                            get_string('recordingtypevideo', 'mod_zoom');
+                        $recordinginfo->recordingtype = $recordingtype;
                         $recordinginfo->passcode = $settingsresponse->password;
                         $recordings[strtotime($rec->recording_start)][] = $recordinginfo;
                     }