Merge lp:~davidc3/unity-scope-chromiumbookmarks/icons-n-dups into lp:unity-scope-chromiumbookmarks

[David Callé]

Fix icons and duplicated results

This branch:
- deduplicates results by ensuring that profiles are only added once to the parsing list.
- prevents an unrelated icon to be used for the next result.
- Cleans the result set creation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/unity-scope-chromiumbookmarks-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-chromiumbookmarks-raring-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-chromiumbookmarks-ci/3/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

48 + open('/tmp/unity-scope-chromiumbookmarks/' + thumbname , 'wb').write(imageinfo)
49 + icon = '/tmp/unity-scope-chromiumbookmarks/' + thumbname

This doesn't seem to be multi-session friendly and also can easily be abused on a multi-user system. Can you generate a true temporary name on startup?

review: Needs Fixing

[lp:~davidc3/unity-scope-chromiumbookmarks/icons-n-dups]

29. By David Callé on 2013-05-16

Create a true temporary folder

[David Callé (davidc3)]

Updated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/unity-scope-chromiumbookmarks-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-chromiumbookmarks-raring-amd64-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-chromiumbookmarks-ci/4/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

45 + if not os.path.exists(TMP):
46 + tmp_folder = tempfile.mkdtemp()

shouldn't it also set TMP = tmp_folder? Otherwise, if TMP doesn't exist, it will create a new tmp folder on each search?

review: Needs Information

[lp:~davidc3/unity-scope-chromiumbookmarks/icons-n-dups]

30. By David Callé on 2013-05-16

Set the correct TMP value for each search

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/unity-scope-chromiumbookmarks-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-chromiumbookmarks-raring-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-chromiumbookmarks-ci/5/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good now. +1

review: Approve

=== modified file 'src/unity_chromiumbookmarks_daemon.py'
--- src/unity_chromiumbookmarks_daemon.py	2013-05-01 23:49:30 +0000
+++ src/unity_chromiumbookmarks_daemon.py	2013-05-16 14:38:30 +0000
@@ -22,6 +22,7 @@
 import json
 import re
 import sqlite3
+import tempfile
 
 APP_NAME = 'unity-scope-chromiumbookmarks'
 LOCAL_PATH = '/usr/share/locale/'
@@ -37,13 +38,14 @@
 PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
 PROVIDER_ICON = SVG_DIR + 'service-chromiumbookmarks.svg'
-DEFAULT_RESULT_ICON = SVG_DIR + 'result-help.svg'
+DEFAULT_RESULT_ICON = 'gtk-about'
 DEFAULT_RESULT_MIMETYPE = 'text/html'
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
 DEFAULT_BOOKMARKS = os.getenv("HOME") + "/.config/chromium/Default/Bookmarks"
 DEFAULT_TOP_SITES = ''
 PARSE_ALL_PROFILES = True
 CHROMIUM_EXECUTABLE = '/usr/bin/chromium-browser'
+TMP = tempfile.mkdtemp()
 
 c1 = {'id': 'bookmarks',
       'name': _('Bookmarks'),
@@ -63,7 +65,9 @@
     try:
         for f in os.listdir(os.getenv("HOME") + "/.config/chromium/"):
             if f == "Default" or f.startswith('Profile '):
-                BOOKMARKS_PATH.append(os.getenv("HOME") + "/.config/chromium/"+f+"/Bookmarks")
+                profile_path = os.getenv("HOME") + "/.config/chromium/"+f+"/Bookmarks"
+                if not profile_path in BOOKMARKS_PATH:
+                    BOOKMARKS_PATH.append(profile_path)
     except Exception as error:
         print(error)
     return BOOKMARKS_PATH
@@ -130,8 +134,12 @@
     Search for help documents matching the search string
     '''
     results = []
-    if not os.path.exists('/tmp/unity-scope-chromiumbookmarks'):
-        os.mkdir('/tmp/unity-scope-chromiumbookmarks')
+    global TMP
+    if not os.path.exists(TMP):
+        tmp_folder = tempfile.mkdtemp()
+        TMP = tmp_folder
+    else:
+        tmp_folder = TMP
 
     for path in get_chromium_profiles():
         user = path.split('/')[-2]
@@ -141,9 +149,6 @@
             thumbnail_path = DEFAULT_TOP_SITES
         else:
             thumbnail_path = path.replace('Bookmarks', 'Top Sites')
-
-        icon = 'gtk-about'
-
         conn = sqlite3.connect(thumbnail_path)
         connection = conn.cursor()
 
@@ -151,22 +156,23 @@
             # Search bookmark names for matches
             if search.lower() in bookmark[0].lower() or search.lower() in bookmark[1].lower():
                 sqlite_query = '''SELECT thumbnail FROM thumbnails WHERE url = "%s"''' % bookmark[1]
-                
+                icon = None
                 connection.execute(sqlite_query)
                 thumb = connection.fetchall()
                 thumbname = bookmark[1].replace('/', '')
                 if thumb:
                     imageinfo = thumb[0][0]
-                    open('/tmp/unity-scope-chromiumbookmarks/' + thumbname , 'wb').write(imageinfo)
-                    icon = '/tmp/unity-scope-chromiumbookmarks/' + thumbname
+                    if imageinfo:
+                        open('%s/%s' % (tmp_folder, thumbname) , 'wb').write(imageinfo)
+                        icon = '%s/%s' % (tmp_folder, thumbname)
                 else:
-                    if os.path.exists('/tmp/unity-scope-chromiumbookmarks/' + thumbname):
-                        os.remove('/tmp/unity-scope-chromiumbookmarks/' + thumbname)
+                    if os.path.exists('%s/%s' % (tmp_folder, thumbname)):
+                        os.remove('%s/%s' % (tmp_folder, thumbname))
                 results.append({'uri': bookmark[1],
                                 'icon': icon,
                                 'category': 0,
                                 'title': bookmark[0],
-                                'user':GLib.Variant('s',user)})
+                                'user':user})
         connection.close()
     return results
 
@@ -240,12 +246,7 @@
                             if m['id'] == e:
                                 i['metadata'][e] = i[e]
                 i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
-                result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
-                                                  i['category'], i['result_type'],
-                                                  str(i['mimetype']), str(i['title']),
-                                                  str(i['comment']), str(i['dnd_uri']),
-                                                  i['metadata'])
-                result_set.add_result(result)
+                result_set.add_result(**i)
         except Exception as error:
             print(error)