Enable videos for uploading additional files

Author: zubeydecivelek

cds/modules/deposit/api.py

@@ -860,15 +860,7 @@ def _rename_subtitles(self):
                 subtitle_obj_key = "{}_{}.vtt".format(
                     self["report_number"][0], match.group("iso_lang")
                 )
-                obj = ObjectVersion.create(
-                    bucket=subtitle_obj.bucket,
-                    key=subtitle_obj_key,
-                    _file_id=subtitle_obj.file_id,
-                )
-                # copy tags to the newly created object version
-                for tag in subtitle_obj.tags:
-                    tag.object_version = obj
-                subtitle_obj.remove()
+                subtitle_obj.key = subtitle_obj_key
 
     def _rename_master_file(self, master_file):
         """Rename master file."""

cds/modules/deposit/ext.py

@@ -25,11 +25,13 @@
 """CDSDeposit app for Webhook receivers."""
 
 import re
+import mimetypes
 
 from invenio_base.signals import app_loaded
 from invenio_db import db
 from invenio_files_rest.models import ObjectVersionTag
 from invenio_files_rest.signals import file_uploaded
+from invenio_files_rest.errors import InvalidKeyError
 from invenio_indexer.signals import before_record_index
 from invenio_records_files.utils import sorted_files_from_bucket
 
@@ -45,38 +47,37 @@
 
 def _create_tags(obj):
     """Create additional tags for file."""
-    # Subtitle file
-    pattern = re.compile(".*_([a-zA-Z]{2})\.vtt$")
+    pattern_subtitle = re.compile(r".*_([a-zA-Z]{2})\.vtt$")
+    pattern_poster = re.compile(r"^poster\.(jpg|png)$")
+    
+    # Get the media_type and content_type(file ext)
+    file_name = obj.key
+    mimetypes.add_type("subtitle/vtt", ".vtt")
+    guessed_type = mimetypes.guess_type(file_name)[0]
+    if guessed_type is None:        
+        raise InvalidKeyError(description=f"Unsupported File: {file_name}")
+
+    media_type = guessed_type.split("/")[0]
+    file_ext = guessed_type.split("/")[1]
+
     with db.session.begin_nested():
-        # language tag
-        found = pattern.findall(obj.key)
-        if len(found) == 1:
-            lang = found[0]
-            ObjectVersionTag.create_or_update(obj, "language", lang)
-        else:
-            # clean to be sure there is no some previous value
-            ObjectVersionTag.delete(obj, "language")
-        # other tags
-        ObjectVersionTag.create_or_update(obj, "content_type", "vtt")
-        ObjectVersionTag.create_or_update(obj, "context_type", "subtitle")
-        ObjectVersionTag.create_or_update(obj, "media_type", "subtitle")
-        # refresh object
-        db.session.add(obj)
+        ObjectVersionTag.create_or_update(obj, "content_type", file_ext)
+        ObjectVersionTag.create_or_update(obj, "media_type", media_type)
+        if file_ext == "vtt":
+            # language tag
+            match = pattern_subtitle.search(file_name)
+            if match:
+                ObjectVersionTag.create_or_update(obj, "language", match.group(1))
+            else:
+                ObjectVersionTag.delete(obj, "language")
+            # other tags
+            ObjectVersionTag.create_or_update(obj, "content_type", "vtt")
+            ObjectVersionTag.create_or_update(obj, "context_type", "subtitle")
+        # poster tag 
+        elif pattern_poster.match(file_name):
+            ObjectVersionTag.create_or_update(obj, "context_type", "poster")
 
-        # Poster frame
-        pattern = re.compile("^poster\.(jpg|png)$")
-        try:
-            poster = pattern.findall(obj.key)
-            if poster:
-                ext = pattern.findall(poster.key)[0]
-                # frame tags
-                ObjectVersionTag.create_or_update(poster, "content_type", ext)
-                ObjectVersionTag.create_or_update(poster, "context_type", "poster")
-                ObjectVersionTag.create_or_update(poster, "media_type", "image")
-                # refresh object
-                db.session.add(poster)
-        except IndexError:
-            return
+        db.session.add(obj)
 
 
 def create_tags_on_file_upload(sender, obj):

cds/modules/deposit/static/templates/cds_deposit/deposits.html

@@ -39,6 +39,7 @@ <h5 class="text-muted"><strong>Tips</strong></h5>
                     <h3>Click here to select videos to upload</h3>
                   </div>
                   <p class="cds-deposit-box-upload-description">You can also <strong>Drag & Drop</strong> video files here</p>
+                  <p class="text-muted mt-20">supported files <mark>{{ $ctrl.videoExtensions }}</mark></p>
                 </div>
               </div>
             </div>

cds/modules/deposit/static/templates/cds_deposit/types/video/uploader.html

@@ -283,6 +283,7 @@ <h5 class="text-muted"><strong>Tips and suggestions</strong></h5>
   </ul>
 </div>
 <!-- Error alert -->
+
 <div class="cds-deposit-box" ng-if="!$ctrl.cdsDepositCtrl.isPublished()">
   <div
        ngf-drag-over-class="'cds-deposit-dragover'"
@@ -309,13 +310,36 @@ <h4>Upload complimentary files for this video</h4>
   <div class="text-muted">
     <h5 class="text-muted"><strong>Tips and suggestions</strong></h5>
     <ul>
-      <li>To replace the video file, just upload another video.</li>
+      <li>To replace the video file, just upload another video here.</li>
     </ul>
+    <div
+      ngf-drag-over-class="{accept: 'cds-deposit-dragover',  delay:100}"
+      ngf-drop=""
+      ngf-change="$ctrl.replaceMasterFile($newFiles, $invalidFiles)"
+      ngf-select=""
+      ngf-model-options="{allowInvalid: false}"
+      ngf-max-size="500GB"
+      ngf-multiple="true"
+      ngf-accept="'{{$ctrl.cdsDepositsCtrl.videoExtensions}}'"
+      ngf-pattern="'{{$ctrl.cdsDepositsCtrl.videoExtensions}}'"
+  >
+  <div class="pa-10 cds-deposit-box-upload-wrapper text-center">
+    <p class="cds-deposit-box-upload-icon mb-20">
+      <i class="fa fa-2x fa-video-camera" aria-hidden="true"></i>
+    </p>
+    <div class="cds-deposit-box-upload-content">
+      <div class="cds-deposit-box-upload-title">
+        <h4>To replace the video file, just upload a video here.</h4>
+      </div>
+      <p class="cds-deposit-box-upload-description"> Or Drag & Drop files</p>
+    </div>
+  </div>
+  </div>
   </div>
 </div>
 <div ng-if="$ctrl.cdsDepositCtrl.isPublished()" class="cds-deposit-box text-muted">
   <h5 class="text-muted"><strong>Tips and suggestions</strong></h5>
   <ul>
     <li>Click the <strong>Edit</strong> button on the top right corner to add more files.</li>
   </ul>
-</div>
+</div>

cds/modules/theme/assets/bootstrap3/js/cds_deposit/avc/components/cdsUploader.js

@@ -115,7 +115,10 @@ function cdsUploaderCtrl(
         if (!upload.key) {
           upload.key = upload.name;
         }
-        if (that.cdsDepositsCtrl.isVideoFile(upload.key)) {
+        if (
+          !upload.isAdditional &&
+          that.cdsDepositsCtrl.isVideoFile(upload.key)
+        ) {
           _subpromise = Upload.http(_startWorkflow(upload, response));
         } else {
           var d = $q.defer();
@@ -278,25 +281,44 @@ function cdsUploaderCtrl(
       }
       // Remove any invalid files
       _files = _.difference(_files, invalidFiles || []);
+
+      // Filter out files without a valid MIME type or with zero size
+      _files = _files.filter((file) => {
+        if (!file.type || file.type.trim() === "") {
+          toaster.pop(
+            "warning",
+            "Invalid File Type",
+            `The file ${file.name} has no valid type.`
+          );
+          return false; // Exclude invalid files
+        }
+
+        if (!file.size || file.size === 0) {
+          toaster.pop(
+            "warning",
+            "Empty File",
+            `The file ${file.name} is empty and cannot be uploaded.`
+          );
+          return false; // Exclude zero-size files
+        }
+
+        return true;
+      });
+
       // Make sure they have proper metadata
       angular.forEach(_files, function (file) {
         file.key = file.name;
         file.local = !file.receiver;
+        file.isAdditional = true;
         // Add any extra paramemters to the files
         if (extraHeaders) {
           file.headers = extraHeaders;
         }
+        file.headers = {
+          "X-Invenio-File-Tags": "context_type=additional_file",
+        };
       });
 
-      // Add the files to the list
-      var masterFile = that.cdsDepositCtrl.findMasterFile() || {};
-      var videoFiles = _.values(
-        that.cdsDepositsCtrl.filterOutFiles(_files).videos
-      );
-
-      // Exclude video files
-      _files = _.difference(_files, videoFiles);
-
       // Find if any of the existing files has been replaced
       // (file with same filename), and if yes remove it from the existing
       // file list (aka from the interface).
@@ -323,6 +345,44 @@ function cdsUploaderCtrl(
       Array.prototype.push.apply(that.files, _files);
       // Add the files to the queue
       Array.prototype.push.apply(that.queue, _files);
+
+      // Start upload automatically if the option is selected
+      if (that.autoStartUpload) {
+        that.upload();
+      }
+    };
+
+    this.replaceMasterFile = function (_files, invalidFiles) {
+      // Do nothing if files array is empty
+      if (!_files) {
+        return;
+      }
+      // Remove any invalid files
+      _files = _.difference(_files, invalidFiles || []);
+      // Make sure they have proper metadata
+      angular.forEach(_files, function (file) {
+        file.key = file.name;
+        file.local = !file.receiver;
+      });
+
+      // Add the files to the list
+      var masterFile = that.cdsDepositCtrl.findMasterFile() || {};
+      var videoFiles = _.values(
+        that.cdsDepositsCtrl.filterOutFiles(_files).videos
+      );
+
+      if ((invalidFiles || []).length > 0) {
+        // Push a notification
+        toaster.pop({
+          type: "error",
+          title:
+            "Invalid file(s) for " +
+            (that.cdsDepositCtrl.record.title.title || "video."),
+          body: _.map(invalidFiles, "name").join(", "),
+          bodyOutputType: "trustedHtml",
+        });
+      }
+
       if (!that.cdsDepositCtrl.master) {
         // Check for new master file
         var newMasterFile = videoFiles[0];
@@ -358,11 +418,6 @@ function cdsUploaderCtrl(
           });
         }
       }
-
-      // Start upload automatically if the option is selected
-      if (that.autoStartUpload) {
-        that.upload();
-      }
     };
 
     // Prepare file request
@@ -431,13 +486,26 @@ function cdsUploaderCtrl(
             function error(response) {
               // Inform the parents
               $scope.$emit("cds.deposit.error", response);
-              // Error uploading notification
-              toaster.pop({
-                type: "error",
-                title: "Error uploading the file(s).",
-                body: (_.map(response, "config.data.key") || []).join(", "),
-                bodyOutputType: "trustedHtml",
-              });
+              // Check if the response contains the error message
+              if (
+                response.status === 400 &&
+                response.data &&
+                response.data.message
+              ) {
+                toaster.pop({
+                  type: "error",
+                  title: response.data.message,
+                  bodyOutputType: "trustedHtml",
+                });
+              } else {
+                // Error uploading notification
+                toaster.pop({
+                  type: "error",
+                  title: "Error uploading the file(s).",
+                  body: (_.map(response, "config.data.key") || []).join(", "),
+                  bodyOutputType: "trustedHtml",
+                });
+              }
             }
           )
           .finally(function done() {

tests/unit/test_video_rest.py

@@ -27,6 +27,7 @@
 
 import copy
 import json
+from io import BytesIO
 from time import sleep
 
 import mock
@@ -44,6 +45,7 @@
 from invenio_db import db
 from invenio_indexer.api import RecordIndexer
 from invenio_search import current_search_client
+from invenio_files_rest.models import ObjectVersion
 
 from cds.modules.deposit.api import deposit_project_resolver, deposit_video_resolver
 from cds.modules.deposit.receivers import datacite_register_after_publish
@@ -588,6 +590,68 @@ def test_mint_doi_with_cli(
             doi, f"https://videos.cern.ch/record/{recid}"
         )
 
+def test_additional_files(    
+    api_app,
+    users,
+    location,
+    json_headers,
+    json_partial_project_headers,
+    json_partial_video_headers,
+    deposit_metadata,
+    video_deposit_metadata,
+    project_deposit_metadata,
+):
+    """Test video publish without DOI, then mint DOI using CLI."""
+    api_app.config["DEPOSIT_DATACITE_MINTING_ENABLED"] = True
+
+    with api_app.test_client() as client:
+        # Log in as the first user
+        login_user(User.query.get(users[0]))
+
+        # Create a new project
+        project_dict = _create_new_project(
+            client, json_partial_project_headers, project_deposit_metadata
+        )
+
+        # Add a new empty video
+        video_dict = _add_video_info_to_project(
+            client, json_partial_video_headers, project_dict, video_deposit_metadata
+        )
+
+        video_depid = video_dict["metadata"]["_deposit"]["id"]
+        video_deposit = deposit_video_resolver(video_depid)
+        video_deposit_id = video_deposit["_deposit"]["id"]
+        bucket_id = video_deposit["_buckets"]["deposit"]
+        
+        # Upload additional file
+        key = "test.mp4"
+        headers = {
+            "X-Invenio-File-Tags": "context_type=additional_file"
+        }
+        resp = client.put(
+        url_for("invenio_files_rest.object_api", bucket_id=bucket_id, key=key),
+            input_stream=BytesIO(b"updated_content"),
+            headers=headers,
+        )
+        assert resp.status_code == 200
+
+        tags = ObjectVersion.get(bucket_id, key).get_tags()
+        assert tags["context_type"] == "additional_file"
+        assert tags["content_type"] == "mp4"
+        assert tags["media_type"] == "video"
+        
+        # Upload invalid file and return 400
+        key = "test"
+        headers = {
+            "X-Invenio-File-Tags": "context_type=additional_file"
+        }
+        resp = client.put(
+        url_for("invenio_files_rest.object_api", bucket_id=bucket_id, key=key),
+            input_stream=BytesIO(b"updated_content"),
+            headers=headers,
+        )
+        assert resp.status_code == 400
+
 
 def _deposit_edit(client, json_headers, id):
     """Post action to edit deposit."""