[pitivi] project_: Fix removal of the proxies from the project



commit ed13f927d26fb3ae9cf5b2953beae322bd7e07ec
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Wed Dec 21 14:51:55 2016 +0100

    project_: Fix removal of the proxies from the project
    
    Fixes https://phabricator.freedesktop.org/T7606
    
    Reviewed-by: Thibault Saunier <tsaunier gnome org>
    Differential Revision: https://phabricator.freedesktop.org/D1572

 pitivi/project.py           |    2 ++
 tests/test_media_library.py |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index d639eae..24b63c0 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -1199,6 +1199,7 @@ class Project(Loggable, GES.Project):
                 # The asset is a proxy for the proxy_target original asset.
                 self.debug("Stop proxying %s", proxy_target.props.id)
                 proxy_target.set_proxy(None)
+                self.remove_asset(asset)
                 proxy_target.force_proxying = False
                 if delete_proxy_file:
                     if not self.app.proxy_manager.is_proxy_asset(asset):
@@ -1207,6 +1208,7 @@ class Project(Loggable, GES.Project):
                                            asset.props.id)
                     os.remove(Gst.uri_get_location(asset.props.id))
             else:
+                # The asset is an original which is not being proxied.
                 self.app.proxy_manager.cancel_job(asset)
 
         if assets:
diff --git a/tests/test_media_library.py b/tests/test_media_library.py
index f0cdc6d..cb1b209 100644
--- a/tests/test_media_library.py
+++ b/tests/test_media_library.py
@@ -127,8 +127,10 @@ class TestMediaLibrary(BaseTestMediaLibrary):
 
         self.assertEqual(proxy.props.proxy_target.props.id, asset_uri)
 
-        self.app.project_manager.current_project.disable_proxies_for_assets(
-            [proxy], delete_proxies)
+        project = self.app.project_manager.current_project
+        self.assertIn(proxy, project.list_assets(GES.UriClip))
+        project.disable_proxies_for_assets([proxy], delete_proxies)
+        self.assertNotIn(proxy, project.list_assets(GES.UriClip))
         self.assertEqual(len(self.medialibrary.storemodel),
                          len(self.samples))
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]