tools: Handle asset relocation for assets from scenario

Allowing us to share scenario and media file!

diff --git a/tools/ges-launch.c b/tools/ges-launch.c
index bb7613dfa2d62442668e3c03cdfe32969f62fa8b..e907723a5621c64b381ed223a0a7e11bb0e6753f 100644 (file)
--- a/tools/ges-launch.c
+++ b/tools/ges-launch.c
@@ -154,11 +154,10 @@ thumbnail_cb (gpointer pipeline)
   return res;
 }
 
-static gchar *
-source_moved_cb (GESProject * project, GError * error, GESAsset * asset)
+gchar *
+ges_launch_get_new_uri_from_wrong_uri (const gchar * old_uri)
 {
   gint i;
-  const gchar *old_uri = ges_asset_get_id (asset);
 
   for (i = 0; i < new_paths->len; i++) {
     gchar *basename, *res;
@@ -179,6 +178,20 @@ source_moved_cb (GESProject * project, GError * error, GESAsset * asset)
   return NULL;
 }
 
+void
+ges_launch_validate_uri (const gchar * nid)
+{
+  g_hash_table_remove (tried_uris, nid);
+}
+
+static gchar *
+source_moved_cb (GESProject * project, GError * error, GESAsset * asset)
+{
+  const gchar *old_uri = ges_asset_get_id (asset);
+
+  return ges_launch_get_new_uri_from_wrong_uri (old_uri);
+}
+
 static void
 error_loading_asset_cb (GESProject * project, GError * error,
     const gchar * failed_id, GType extractable_type)

diff --git a/tools/ges-validate.c b/tools/ges-validate.c
index e94218be705dff7e64b9238316bb9ee943fa2223..1978d4ab54b202581a0abc46d72bdade35f1387c 100644 (file)
--- a/tools/ges-validate.c
+++ b/tools/ges-validate.c
@@ -135,6 +135,52 @@ beach:
   return res;
 }
 
+static GESAsset *
+_get_asset (GType type, const gchar * id)
+{
+  GESAsset *asset;
+  GError *error = NULL;
+
+  const gchar *new_id = id;
+
+  if (type == GES_TYPE_URI_CLIP)
+    asset = (GESAsset *) ges_uri_clip_asset_request_sync (id, &error);
+  else
+    asset = ges_asset_request (type, id, &error);
+
+  while (error &&
+      error->domain == GST_RESOURCE_ERROR &&
+      error->code == GST_RESOURCE_ERROR_NOT_FOUND &&
+      type == GES_TYPE_URI_CLIP) {
+
+    if (new_id == NULL)
+      break;
+
+    g_clear_error (&error);
+    new_id = ges_launch_get_new_uri_from_wrong_uri (new_id);
+
+    if (new_id)
+      asset = (GESAsset *) ges_uri_clip_asset_request_sync (new_id, &error);
+    else
+      GST_ERROR ("Cant find anything for %s", new_id);
+
+    if (asset && !error)
+      ges_launch_validate_uri (new_id);
+  }
+
+  if (!asset || error) {
+    GST_ERROR
+        ("There was an error requesting the asset with id %s and type %s (%s)",
+        id, g_type_name (type), error ? error->message : "unknown");
+
+    return NULL;
+  }
+
+  return asset;
+}
+
+
+
 static gboolean
 _add_asset (GstValidateScenario * scenario, GstValidateAction * action)
 {
@@ -144,12 +190,14 @@ _add_asset (GstValidateScenario * scenario, GstValidateAction * action)
   GESTimeline *timeline = get_timeline (scenario);
   GESProject *project = ges_timeline_get_project (timeline);
   GESAsset *asset;
-  GError *error = NULL;
   gboolean res = FALSE;
 
   id = gst_structure_get_string (action->structure, "id");
   type_string = gst_structure_get_string (action->structure, "type");
 
+  gst_validate_printf (action, "Adding asset of type %s with ID %s\n",
+      id, type_string);
+
   if (!type_string || !id) {
     GST_ERROR ("Missing parameters, we got type %s and id %s", type_string, id);
     goto beach;
@@ -160,16 +208,10 @@ _add_asset (GstValidateScenario * scenario, GstValidateAction * action)
     goto beach;
   }
 
-  if (type == GES_TYPE_URI_CLIP)
-    asset = (GESAsset *) ges_uri_clip_asset_request_sync (id, &error);
-  else
-    asset = ges_asset_request (type, id, &error);
+  asset = _get_asset (type, id);
 
-  if (!asset || error) {
-    GST_ERROR ("There was an error requesting the asset with id %s and type %s",
-        id, type_string);
-    goto beach;
-  }
+  if (!asset)
+    return FALSE;
 
   res = ges_project_add_asset (project, asset);
 
@@ -296,7 +338,6 @@ _add_clip (GstValidateScenario * scenario, GstValidateAction * action)
   GESAsset *asset;
   GESLayer *layer;
   GESClip *clip;
-  GError *error = NULL;
   gint layer_priority;
   const gchar *name;
   const gchar *asset_id;
@@ -315,19 +356,22 @@ _add_clip (GstValidateScenario * scenario, GstValidateAction * action)
   gst_validate_action_get_clocktime (scenario, action, "inpoint", &inpoint);
   gst_validate_action_get_clocktime (scenario, action, "duration", &duration);
 
+  gst_validate_printf (action, "Adding clip from asset of type %s with ID %s"
+      " wanted name: %s"
+      " -- start: %" GST_TIME_FORMAT
+      ", inpoint: %" GST_TIME_FORMAT
+      ", duration: %" GST_TIME_FORMAT "\n",
+      type_string, asset_id, name,
+      GST_TIME_ARGS (start), GST_TIME_ARGS (inpoint), GST_TIME_ARGS (duration));
+
   if (!(type = g_type_from_name (type_string))) {
     GST_ERROR ("This type doesn't exist : %s", type_string);
     goto beach;
   }
 
-  asset = ges_asset_request (type, asset_id, &error);
-
-  if (!asset || error) {
-    GST_ERROR
-        ("There was an error requesting the asset with id %s and type %s (%s)",
-        asset_id, type_string, error->message);
-    goto beach;
-  }
+  asset = _get_asset (type, asset_id);
+  if (!asset)
+    return FALSE;
 
   layer = _get_layer_by_priority (timeline, layer_priority);
 

diff --git a/tools/ges-validate.h b/tools/ges-validate.h
index c21458577c1a304ce7d880885620e957a859766d..e805fefba7bfddfe6b18f9908504b318f28d7548 100644 (file)
--- a/tools/ges-validate.h
+++ b/tools/ges-validate.h
@@ -27,6 +27,8 @@ G_BEGIN_DECLS
 
 gboolean
 ges_validate_activate (GstPipeline *pipeline, const gchar *scenario, gboolean *needs_set_state);
+gchar * ges_launch_get_new_uri_from_wrong_uri (const gchar *old_uri);
+void ges_launch_validate_uri (const gchar *nid);
 
 gint
 ges_validate_clean (GstPipeline *pipeline);