[pitivi] utils/misc: Add a filename_from_uri function and use it in timeline previewers
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] utils/misc: Add a filename_from_uri function and use it in timeline previewers
- Date: Wed, 17 Jul 2013 00:48:54 +0000 (UTC)
commit 0f2a5ac1fed10b1be4bfb93972cd708ed55cdaba
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date: Mon Jul 1 23:47:42 2013 -0400
utils/misc: Add a filename_from_uri function and use it in timeline previewers
pitivi/timeline/previewers.py | 4 ++--
pitivi/utils/misc.py | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/pitivi/timeline/previewers.py b/pitivi/timeline/previewers.py
index 5128f43..e904a91 100644
--- a/pitivi/timeline/previewers.py
+++ b/pitivi/timeline/previewers.py
@@ -35,7 +35,7 @@ from gi.repository import Clutter, Gst, GLib, GdkPixbuf, Cogl
from pitivi.utils.loggable import Loggable
from pitivi.utils.timeline import Zoomable
from pitivi.utils.ui import EXPANDED_SIZE, SPACING
-from pitivi.utils.misc import path_from_uri, quote_uri
+from pitivi.utils.misc import filename_from_uri, quote_uri
from pitivi.utils.ui import EXPANDED_SIZE, SPACING, CONTROL_WIDTH
from math import log1p, log10
@@ -463,7 +463,7 @@ class ThumbnailCache(Loggable):
Loggable.__init__(self)
# TODO: replace with utils.misc.hash_file
self._filehash = hash_file(Gst.uri_get_location(uri))
- self._filename = os.path.basename(path_from_uri(uri))
+ self._filename = filename_from_uri(uri)
# TODO: replace with pitivi.settings.xdg_cache_home()
cache_dir = get_dir(os.path.join(xdg_dirs.xdg_cache_home, "pitivi"), autocreate)
dbfile = os.path.join(get_dir(os.path.join(cache_dir, "thumbs")), self._filehash)
diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
index 4f7716a..668fab5 100644
--- a/pitivi/utils/misc.py
+++ b/pitivi/utils/misc.py
@@ -172,6 +172,14 @@ def path_from_uri(uri):
return unquote(path)
+def filename_from_uri(uri):
+ """
+ Return a human-readable filename (excluding the path to the file) to be
+ used in UI elements or to shorten debug statements
+ """
+ return os.path.basename(path_from_uri(uri))
+
+
def quote_uri(uri):
"""
Encode a URI/path according to RFC 2396, without touching the file:/// part.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]