aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/storage
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2011-09-23 02:35:57 +0200
committerJoar Wandborg <git@wandborg.com>2011-09-23 02:35:57 +0200
commit93bdab9daad3ae431afd41a2efaefae05a555d88 (patch)
tree2586f778bbba650600c1d8a1480230e32a15bb34 /mediagoblin/storage
parent9122a9d047765574bb0d11436522a6c868da86cc (diff)
downloadmediagoblin-93bdab9daad3ae431afd41a2efaefae05a555d88.tar.lz
mediagoblin-93bdab9daad3ae431afd41a2efaefae05a555d88.tar.xz
mediagoblin-93bdab9daad3ae431afd41a2efaefae05a555d88.zip
Multimedia support - Commiting from a not yet finished state - Details below
* DONE Initially testing with arista ** DONE Video display templates *** TODO Multi-browser support ** TODO Video thumbnails ** TODO Link to original video ** TODO Video cropping Also contains a lot of "debug" print's
Diffstat (limited to 'mediagoblin/storage')
-rw-r--r--mediagoblin/storage/cloudfiles.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py
index b1dd9450..85d52242 100644
--- a/mediagoblin/storage/cloudfiles.py
+++ b/mediagoblin/storage/cloudfiles.py
@@ -97,8 +97,14 @@ class CloudFilesStorage(StorageInterface):
def delete_file(self, filepath):
# TODO: Also delete unused directories if empty (safely, with
# checks to avoid race conditions).
- self.container.delete_object(
- self._resolve_filepath(filepath))
+ try:
+ self.container.delete_object(
+ self._resolve_filepath(filepath))
+ except cloudfiles.container.ResponseError:
+ pass
+ finally:
+ pass
+
def file_url(self, filepath):
return '/'.join([