tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unity scope: compute url encoding locally instead of calling lib, for conformance with whats expected by the thumbnailing thingies

Browse Source
This commit is contained in:
Jean-Francois Dockes 2014-04-01 16:12:54 +02:00
parent 6dd3fdc725
commit c63e1c9167
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/desktop/unity-scope-recoll/unity_recoll_daemon.py
View File

@ -110,25 +110,38 @@ XDGCACHE = os.getenv('XDG_CACHE_DIR', os.path.expanduser("~/.cache"))
THUMBDIRS = [os.path.join(XDGCACHE, "thumbnails"), THUMBDIRS = [os.path.join(XDGCACHE, "thumbnails"),
os.path.expanduser("~/.thumbnails")] os.path.expanduser("~/.thumbnails")]
def url_encode_for_thumb(in_s, offs):
h = b"0123456789ABCDEF"
out = in_s[:offs]
for i in range(offs, len(in_s)):
c = in_s[i]
if c <= 0x20 or c >= 0x7f or in_s[i] in b'"#%;<>?[\\]^`{|}':
out += bytes('%', 'ascii');
out += bytes(chr(h[(c >> 4) & 0xf]), 'ascii')
out += bytes(chr(h[c & 0xf]), 'ascii')
else:
out += bytes(chr(c), 'ascii')
pass
return out
def _get_thumbnail_path(url): def _get_thumbnail_path(url):
"""Look for a thumbnail for the input url, according to the """Look for a thumbnail for the input url, according to the
freedesktop thumbnail storage standard. The input 'url' always freedesktop thumbnail storage standard. The input 'url' always
begins with file:// and is unencoded. We encode it properly begins with file:// and is binary. We encode it properly
and compute the path inside the thumbnail storage and compute the path inside the thumbnail storage
directory. We return the path only if the thumbnail does exist directory. We return the path only if the thumbnail does exist
(no generation performed)""" (no generation performed)"""
global THUMBDIRS global THUMBDIRS
# Compute the thumbnail file name by encoding and hashing the url string # Compute the thumbnail file name by encoding and hashing the url string
path = url[7:]
try: try:
path = "file://" + urllib.parse.quote_from_bytes(path) url = url_encode_for_thumb(url, 7)
except Exception as msg: except Exception as msg:
print("_get_thumbnail_path: urllib.parse.quote failed: %s" % msg, print("_get_thumbnail_path: url encode failed: %s" % msg,
file=sys.stderr) file=sys.stderr)
return "" return ""
#print("_get_thumbnail: encoded path: [%s]" % path, file=sys.stderr) #print("_get_thumbnail: encoded path: [%s]" % url, file=sys.stderr)
thumbname = hashlib.md5(path.encode('utf-8')).hexdigest() + ".png" thumbname = hashlib.md5(url).hexdigest() + ".png"
# If the "new style" directory exists, we should stop looking in # If the "new style" directory exists, we should stop looking in
# the "old style" one (there might be interesting files in there, # the "old style" one (there might be interesting files in there,