[Pkg-sugar-commit] [sugar] 03/10: Fix Journal cannot copy entries without mime_type

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository sugar.

commit 4c87ae50f40f31bebc2dd821e32b2e221febfa00
Author: Martin Abente Lahaye <tch at sugarlabs.org>
Date:   Wed Jul 29 10:11:53 2015 -0400

    Fix Journal cannot copy entries without mime_type
    
    Some web activities do not write the "mime_type" entry
    in their metadata. This field is used when copying entries
    to external devices, while finding a proper extension.
    
    Therefore, make this particular piece of code a bit more
    robust against that missing field.
    
    Signed-off-by: Martin Abente Lahaye <tch at sugarlabs.org>
---
 src/jarabe/journal/model.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 74bada0..b78dbee 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -806,11 +806,11 @@ def _write_entry_on_external_device(metadata, file_path, ready_callback=None):
         # only change the extension if the title don't have a good extension
         clean_name, extension = os.path.splitext(file_name)
         extension = extension.replace('.', '').lower()
-        mime_extensions = mime.get_extensions_by_mimetype(
-            metadata['mime_type'])
-        if extension not in mime_extensions:
-            file_name = get_file_name(metadata['title'],
-                                      metadata['mime_type'])
+        mime_type = metadata.get('mime_type', None)
+        if mime_type is not None:
+            mime_extensions = mime.get_extensions_by_mimetype(mime_type)
+            if extension not in mime_extensions:
+                file_name = get_file_name(metadata['title'], mime_type)
 
         destination_path = os.path.join(metadata['mountpoint'], file_name)
         if destination_path != file_path:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar.git