Merge pull request #177 from kenmcgaugh/feature_custom_uri

Modifications to allow data_source plugins to handle custom URI's.

Author: tedwaine

src/playlist/src/playlist_actor.cpp

@@ -185,6 +185,47 @@ void blocking_loader(
     rp.deliver(result);
 }
 
+void blocking_loader_other(
+    blocking_actor *self,
+    caf::typed_response_promise<std::vector<UuidActor>> rp,
+    UuidActor dst,
+    const caf::uri &path,
+    const FrameRate &default_rate,
+    const bool auto_gather,
+    const caf::actor &session,
+    const caf::actor &pm,
+    const utility::Uuid &before) {
+
+    anon_mail(playlist::loading_media_atom_v, true).send(dst.actor());
+
+    self->mail(data_source::use_data_atom_v, path, default_rate, false)
+        .request(pm, infinite)
+        .receive(
+            [=](const utility::UuidActorVector &uav) mutable {
+                self->mail(playlist::add_media_atom_v, uav, before)
+                    .request(dst.actor(), infinite)
+                    .receive(
+                        [=](const bool) mutable {
+                            if (auto_gather) {
+                                for (const auto &i : uav) {
+                                    anon_mail(media_hook::gather_media_sources_atom_v, i.actor(), default_rate)
+                                        .send(session);
+                                }
+                            }
+                            anon_mail(loading_media_atom_v, false).send(dst.actor());
+                            rp.deliver(uav);
+                        },
+                        [=](error &err) mutable {
+                            anon_mail(loading_media_atom_v, false).send(dst.actor());
+                            rp.deliver(std::move(err));
+                        });
+            },
+            [=](error &err) mutable {
+                anon_mail(loading_media_atom_v, false).send(dst.actor());
+                rp.deliver(std::move(err));
+            });
+}
+
 
 PlaylistActor::PlaylistActor(
     caf::actor_config &cfg, const utility::JsonStore &jsn, const caf::actor &session)
@@ -597,18 +638,37 @@ caf::message_handler PlaylistActor::message_handler() {
             const utility::FrameRate &rate,
             const utility::Uuid &uuid_before) -> result<std::vector<UuidActor>> {
             auto rp = make_response_promise<std::vector<UuidActor>>();
-            spawn(
-                blocking_loader,
-                rp,
-                UuidActor(base_.uuid(), actor_cast<caf::actor>(this)),
-                path,
-                recursive,
-                rate,
-                auto_gather_sources_,
-                actor_cast<caf::actor>(session_),
-                uuid_before);
 
             mail(utility::event_atom_v, loading_media_atom_v, true).send(base_.event_group());
+
+            if (path.scheme() == "file" or
+                path.scheme().find("http") == 0) {
+                spawn(
+                    blocking_loader,
+                    rp,
+                    UuidActor(base_.uuid(), actor_cast<caf::actor>(this)),
+                    path,
+                    recursive,
+                    rate,
+                    auto_gather_sources_,
+                    actor_cast<caf::actor>(session_),
+                    uuid_before);
+
+            } else {
+                // Unrecognised URI scheme, so see if one of the plugins can do something with it
+                auto pm = system().registry().template get<caf::actor>(plugin_manager_registry);
+                spawn(
+                    blocking_loader_other,
+                    rp,
+                    UuidActor(base_.uuid(), actor_cast<caf::actor>(this)),
+                    path,
+                    rate,
+                    auto_gather_sources_,
+                    actor_cast<caf::actor>(session_),
+                    pm,
+                    uuid_before);
+            }
+                    
             return rp;
         },
 

src/timeline/src/timeline_actor.cpp

@@ -859,7 +859,8 @@ void timeline_importer(
         }
 
         // active_path maybe relative..
-        if (not active_path.empty() and not caf::make_uri(active_path)) {
+	const auto uri = caf::make_uri(active_path);
+        if (not uri) {
             // not uri....
             // assume relative ?
             if (active_path[0] != '/') {
@@ -892,6 +893,22 @@ void timeline_importer(
             spdlog::warn("{} {}", __PRETTY_FUNCTION__, err.what());
         }
 
+	if (uri and uri->scheme() != "file" and
+	    not uri->scheme().starts_with("http")) {
+	    // unrecognized URI scheme, so send it to the data_source plugins
+	    auto pm = self->system().registry().template get<caf::actor>(plugin_manager_registry);
+	    caf::scoped_actor sys(self->system());
+	    auto plugin_media_tmp = request_receive<UuidActorVector>(
+		*sys, pm, data_source::use_data_atom_v, *uri, timeline_rate, false);
+	    if (not plugin_media_tmp.empty()) {
+		target_url_map[active_path] = plugin_media_tmp[0];
+		if (not clip_metadata.is_null())
+		    anon_mail(json_store::set_json_atom_v, clip_metadata, "/metadata/timeline")
+			.send(target_url_map[active_path].actor());
+		continue;
+	    }
+	}
+
         // check we're not adding the same media twice.
         UuidActorVector sources;
 

ui/qml/xstudio/windows/drag_drop/XsGlobalDragDropHandler.qml

@@ -72,6 +72,7 @@ DropArea {
     keys: [
         "text/uri-list",
         "xstudio/media-ids",
+        "text/plain",
         "application/x-dneg-ivy-entities-v1"
     ]
 

ui/qml/xstudio/windows/main_menu_bar/file_menu/XsFileFunctions.qml

@@ -321,25 +321,13 @@ Item {
 
     function addMediaFromClipboard() {
         if(clipboard.text.length) {
-            let ct = ""
-            clipboard.text.split("\n").forEach(function (item, index) {
-                    // replace #'s
-                    // item.replace(/[#]+/, "*")
-                    ct = ct + "file://" + item + "\n"
-                }
-            )
-            if(!sessionSelectionModel.currentIndex.valid) {
-                var index = theSessionData.createPlaylist("Add Media")
-                Future.promise(index.model.handleDropFuture(Qt.CopyAction, {"text/uri-list": ct}, index)).then(function(quuids){
-                    mediaSelectionModel.selectFirstNewMedia(index, quuids)
-                })
-            }
-            else {
-                let index = sessionSelectionModel.currentIndex
-                Future.promise(index.model.handleDropFuture(Qt.CopyAction, {"text/uri-list": ct}, index)).then(function(quuids){
-                    mediaSelectionModel.selectFirstNewMedia(index, quuids)
-                })
+            var index = sessionSelectionModel.currentIndex
+            if (!index.valid) {
+                index = theSessionData.createPlaylist("Add Media")
             }
+            Future.promise(index.model.handleDropFuture(Qt.CopyAction, {"text/plain": clipboard.text}, index)).then(function(quuids){
+                mediaSelectionModel.selectFirstNewMedia(index, quuids)
+            })
         }
     }