[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40916] branches/soc-2011-tomato/release/ scripts/startup/bl_operators/clip.py: Camera tracking integration

[Sergey Sharybin]

Revision: 40916
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40916
Author:   nazgul
Date:     2011-10-10 18:19:54 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Camera tracking integration
===========================

More safe implementation of delete proxy operator.

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py	2011-10-10 17:42:04 UTC (rev 40915)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py	2011-10-10 18:19:54 UTC (rev 40916)
@@ -112,10 +112,18 @@
 
         return wm.invoke_confirm(self, event)
 
+    def _rmproxy(self, abspath):
+        if not os.path.exists(abspath):
+            return
+
+        if os.path.isdir(abspath):
+            shutil.rmtree(abspath)
+        else:
+            os.remove(abspath)
+
     def execute(self, context):
         sc = context.space_data
         clip = sc.clip
-
         if clip.use_proxy_custom_directory:
             proxydir = clip.proxy.directory
         else:
@@ -126,11 +134,26 @@
         proxy = os.path.join(proxydir, clipfile)
         absproxy = bpy.path.abspath(proxy)
 
-        if os.path.exists(absproxy):
-            shutil.rmtree(absproxy)
-        else:
-            return {'CANCELLED'}
+        # proxy_<quality>[_undostorted]
+        for x in (25, 50, 75, 100):
+            d = os.path.join(absproxy, 'proxy_' + str(x))
 
+            self._rmproxy(d)
+            self._rmproxy(d + '_undistorted')
+            self._rmproxy(os.path.join(absproxy, 'proxy_' + str(x) + '.avi'))
+
+        tc = ('free_run.blen_tc', 'interp_free_run.blen_tc', \
+              'record_run.blen_tc')
+
+        for x in tc:
+            self._rmproxy(os.path.join(absproxy, x))
+
+        # remove proxy per-clip directory
+        try:
+            os.rmdir(absproxy)
+        except OSError:
+            pass
+
         # remove [custom] proxy directory if empty
         try:
             absdir = bpy.path.abspath(proxydir)