Merge commit 'upstream/0.4.3'

1 files changed, 18 insertions, 3 deletions

diff --git a/rapid/metadatavideo.py b/rapid/metadatavideo.py
index 7b6bc6c..5519143 100644
--- a/rapid/metadatavideo.py
+++ b/rapid/metadatavideo.py
@@ -17,13 +17,13 @@
 ### along with this program; if not, write to the Free Software
 ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+HAVE_HACHOIR = True
 DOWNLOAD_VIDEO = True
 
 import os
 import datetime
 import time
 import subprocess
-import tempfile
 
 import multiprocessing
 import logging
@@ -33,15 +33,30 @@ import gtk
 import paths
 
 import rpdfile
+import metadataexiftool
+
+from gettext import gettext as _
 
 try:
     from hachoir_core.cmd_line import unicodeFilename
     from hachoir_parser import createParser
     from hachoir_metadata import extractMetadata
 except ImportError:
-    DOWNLOAD_VIDEO = False
+    HAVE_HACHOIR = False
+
+if not HAVE_HACHOIR:
+    v = metadataexiftool.version_info()
+    if v is None:
+        DOWNLOAD_VIDEO = False
+
+def file_types_to_download():
+    """Returns a string with the types of file to download, to display to the user"""
+    if DOWNLOAD_VIDEO:
+        return _("photos and videos")
+    else:
+        return _("photos")
 
-if DOWNLOAD_VIDEO:
+if HAVE_HACHOIR:
 
     def version_info():
         from hachoir_metadata.version import VERSION