[pitivi] project: Make sure to keep track of all relocated assets

[Thibault Saunier <tsaunier src gnome org>]

commit 981ae5fdf1ec9c6ee34a1e61e465b2cb757e0e56
Author: Thibault Saunier <tsaunier igalia com>
Date:   Fri Jul 27 22:32:00 2018 -0400

    project: Make sure to keep track of all relocated assets
    
    So that we can apply our knowledge of asset relocation when dealing
    with deleted proxies and GES is finding the new asset location by
    itself (after the user provided a specified a relocated asset).
    
    This also requires:
        
http://cgit.freedesktop.org/gstreamer/gst-editing-services/commit/?id=5f5cbd111cd41e11d3e2f875ed4545eb7c0e3df2
    
    Fixes https://gitlab.gnome.org/GNOME/pitivi/issues/2203

 pitivi/project.py     |  7 ++++++-
 tests/test_project.py | 14 +++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index c0dc16e1..a760e783 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -1270,7 +1270,12 @@ class Project(Loggable, GES.Project):
             self.__deleted_proxy_files.add(asset.props.id)
             return target_uri
 
-        return GES.Project.do_missing_uri(self, error, asset)
+        new_uri = GES.Project.do_missing_uri(self, error, asset)
+
+        if new_uri:
+            self.relocated_assets[asset.props.id] = new_uri
+
+        return new_uri
 
     def _prepare_asset_processing(self, asset):
         asset.creation_progress = 0
diff --git a/tests/test_project.py b/tests/test_project.py
index bfb7f8bd..7fbcfe67 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -487,7 +487,7 @@ class TestProjectLoading(common.TestCase):
             mainloop.run()
         self.assertEqual(medialib._progressbar.get_fraction(), 1.0)
 
-    def test_loading_project_with_moved_asset_and_deleted_proxy(self):
+    def test_loading_project_with_moved_assets_and_deleted_proxy(self):
         """Loads a project with moved asset as deleted proxy file."""
 
         mainloop = common.create_main_loop()
@@ -495,14 +495,16 @@ class TestProjectLoading(common.TestCase):
         def proxy_ready_cb(unused_proxy_manager, asset, proxy):
             mainloop.quit()
 
-        app = common.create_pitivi()
+        app = common.create_pitivi(proxyingStrategy=ProxyingStrategy.ALL)
         app.proxy_manager.connect("proxy-ready", proxy_ready_cb)
 
         proj_uri = self.create_project_file_from_xges(app, """<ges version='0.3'>
   <project properties='properties;' metadatas='metadatas, name=(string)&quot;New\ Project&quot;, 
author=(string)Unknown, render-scale=(double)100, format-version=(string)0.3;'>
     <ressources>
       <asset id='file:///nop/1sec_simpsons_trailer.mp4' extractable-type-name='GESUriClip' 
properties='properties, supported-formats=(int)6, duration=(guint64)1228000000;' metadatas='metadatas, 
audio-codec=(string)&quot;MPEG-4\ AAC\ audio&quot;, maximum-bitrate=(uint)130625, bitrate=(uint)130625, 
datetime=(datetime)2007-02-19T05:03:04Z, encoder=(string)Lavf54.6.100, container-format=(string)&quot;ISO\ 
MP4/M4A&quot;, video-codec=(string)&quot;H.264\ /\ AVC&quot;, file-size=(guint64)232417;'  
proxy-id='file:///nop/1sec_simpsons_trailer.mp4.232417.proxy.mkv' />
+      <asset id='file:///nop/tears_of_steel.webm' extractable-type-name='GESUriClip' properties='properties, 
supported-formats=(int)6, duration=(guint64)2003000000;' metadatas='metadatas, 
container-format=(string)Matroska, language-code=(string)und, application-name=(string)Lavc56.60.100, 
encoder=(string)&quot;Xiph.Org\ libVorbis\ I\ 20150105\ 
\(\342\233\204\342\233\204\342\233\204\342\233\204\)&quot;, encoder-version=(uint)0, 
audio-codec=(string)Vorbis, nominal-bitrate=(uint)80000, bitrate=(uint)80000, video-codec=(string)&quot;VP8\ 
video&quot;, file-size=(guint64)223340;' />
       <asset id='file:///nop/1sec_simpsons_trailer.mp4.232417.proxy.mkv' extractable-type-name='GESUriClip' 
properties='properties, supported-formats=(int)6, duration=(guint64)1228020833;' metadatas='metadatas, 
container-format=(string)Matroska, audio-codec=(string)Opus, language-code=(string)en, 
encoder=(string)Lavf54.6.100, bitrate=(uint)64000, video-codec=(string)&quot;Motion\ JPEG&quot;, 
file-size=(guint64)4694708;' />
+      <asset id='file:///nop/tears_of_steel.webm.223340.proxy.mkv' extractable-type-name='GESUriClip' 
properties='properties, supported-formats=(int)6, duration=(guint64)2003000000;' metadatas='metadatas, 
container-format=(string)Matroska, language-code=(string)und, application-name=(string)Lavc56.60.100, 
encoder=(string)&quot;Xiph.Org\ libVorbis\ I\ 20150105\ 
\(\342\233\204\342\233\204\342\233\204\342\233\204\)&quot;, encoder-version=(uint)0, 
audio-codec=(string)Vorbis, nominal-bitrate=(uint)80000, bitrate=(uint)80000, video-codec=(string)&quot;VP8\ 
video&quot;, file-size=(guint64)223340;' />
     </ressources>
 </project>
 </ges>""")
@@ -510,7 +512,7 @@ class TestProjectLoading(common.TestCase):
         medialib = medialibrary.MediaLibraryWidget(app)
 
         # Remove proxy
-        with common.cloned_sample("1sec_simpsons_trailer.mp4"):
+        with common.cloned_sample("1sec_simpsons_trailer.mp4", "tears_of_steel.webm"):
             def new_project_loaded_cb(*args, **kwargs):
                 mainloop.quit()
 
@@ -518,7 +520,7 @@ class TestProjectLoading(common.TestCase):
 
             def missing_uri_cb(project_manager, project, unused_error, asset):
                 missing_uris.append(asset.props.id)
-                return common.get_sample_uri("1sec_simpsons_trailer.mp4")
+                return common.get_sample_uri(os.path.basename(asset.props.id))
 
             project_manager.connect("missing-uri", missing_uri_cb)
             project_manager.connect("new-project-loaded", new_project_loaded_cb)
@@ -529,10 +531,12 @@ class TestProjectLoading(common.TestCase):
                 "missing_uri_cb should be called only once, got %s." % missing_uris)
             self.assertEqual(medialib._progressbar.get_fraction(), 1.0)
             mainloop.run()
-            self.assertEqual(len(medialib.storemodel), 1,
+            self.assertEqual(len(medialib.storemodel), 2,
                 "We should have one asset displayed in the MediaLibrary.")
             self.assertEqual(medialib.storemodel[0][medialibrary.COL_THUMB_DECORATOR].state,
                              medialibrary.AssetThumbnail.PROXIED)
+            self.assertEqual(medialib.storemodel[1][medialibrary.COL_THUMB_DECORATOR].state,
+                             medialibrary.AssetThumbnail.IN_PROGRESS)
 
 
 class TestProjectSettings(common.TestCase):