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

sort of works except for filters

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-11-07 14:22:39 +01:00
parent 9cbd7f2d09
commit 613b090c7b
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@ import gettext
import locale import locale
import sys import sys
import time import time
import urllib.parse
import hashlib
from gi.repository import GLib, GObject, Gio from gi.repository import GLib, GObject, Gio
from gi.repository import Accounts, Signon from gi.repository import Accounts, Signon
@ -76,17 +78,17 @@ def _get_thumbnail_path(url):
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
print("_get_thumbnail_path", file=sys.stderr)
# 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:] path = url[7:]
try: try:
path = "file://" + urllib.quote(path) path = "file://" + urllib.parse.quote_from_bytes(path)
except: except Exception as msg:
#print("_get_thumbnail_path: urllib.quote failed") print("_get_thumbnail_path: urllib.parse.quote failed: %s" % msg,
file=sys.stderr)
return None return None
print("_get_thumbnail: encoded path: [%s]" % (path,), file=sys.stderr) #print("_get_thumbnail: encoded path: [%s]" % path, file=sys.stderr)
thumbname = hashlib.md5(path).hexdigest() + ".png" thumbname = hashlib.md5(path.encode('utf-8')).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,
@ -101,7 +103,7 @@ def _get_thumbnail_path(url):
for topdir in THUMBDIRS: for topdir in THUMBDIRS:
for dir in ("large", "normal"): for dir in ("large", "normal"):
tpath = os.path.join(topdir, dir, thumbname) tpath = os.path.join(topdir, dir, thumbname)
# print("Testing [%s]" % (tpath,)) #print("Testing [%s]" % (tpath,))
if os.path.exists(tpath): if os.path.exists(tpath):
return tpath return tpath
@ -116,16 +118,13 @@ class RecollScope(Unity.AbstractScope):
self.search_in_global = True; self.search_in_global = True;
lng, self.localecharset = locale.getdefaultlocale() lng, self.localecharset = locale.getdefaultlocale()
print("RecollScope: __init__ done", file=sys.stderr)
def do_get_group_name(self): def do_get_group_name(self):
# The primary bus name we grab *must* match what we specify in our # The primary bus name we grab *must* match what we specify in our
# .scope file # .scope file
print("RecollScope: do_get_group_name", file=sys.stderr)
return "org.recoll.Unity.Scope.File.Recoll" return "org.recoll.Unity.Scope.File.Recoll"
def do_get_unique_name(self): def do_get_unique_name(self):
print("RecollScope: do_get_unique_name", file=sys.stderr)
return "/org/recoll/unity/scope/file/recoll" return "/org/recoll/unity/scope/file/recoll"
def do_get_filters(self): def do_get_filters(self):
@ -168,9 +167,6 @@ class RecollScope(Unity.AbstractScope):
return cats return cats
def do_get_schema (self): def do_get_schema (self):
'''
Adds specific metadata fields
'''
print("RecollScope: do_get_schema", file=sys.stderr) print("RecollScope: do_get_schema", file=sys.stderr)
schema = Unity.Schema.new () schema = Unity.Schema.new ()
return schema return schema
@ -188,10 +184,9 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
self.set_search_context(search_context) self.set_search_context(search_context)
if hasrclconfig: if hasrclconfig:
self.config = rclconfig.RclConfig() self.config = rclconfig.RclConfig()
print("RecollScopeSearch: __init__ done", file=sys.stderr)
def connect_db(self): def connect_db(self):
print("RecollScopeSearch: Connecting to db", file=sys.stderr) #print("RecollScopeSearch: connect_db", file=sys.stderr)
self.db = None self.db = None
dblist = [] dblist = []
if hasrclconfig: if hasrclconfig:
@ -205,12 +200,11 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
return return
def do_run(self): def do_run(self):
print("RecollScopeSearch: do_run", file=sys.stderr) #print("RecollScopeSearch: do_run", file=sys.stderr)
context = self.search_context context = self.search_context
filters = context.filter_state filters = context.filter_state
search_string = context.search_query search_string = context.search_query
result_set = context.result_set result_set = context.result_set
print("Search changed to: '%s'" % search_string)
# Get the list of documents # Get the list of documents
is_global = context.search_type == Unity.SearchType.GLOBAL is_global = context.search_type == Unity.SearchType.GLOBAL
@ -224,6 +218,8 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
datef = self.date_filter(filters) datef = self.date_filter(filters)
" ".join((search_string, catgf, datef)) " ".join((search_string, catgf, datef))
print("RecollScopeSearch::do_run: Search: [%s]" % search_string)
# Do the recoll thing # Do the recoll thing
try: try:
query = self.db.query() query = self.db.query()
@ -262,15 +258,6 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
else: else:
category = 1 category = 1
# result_set.add_result(
# uri=url,
# icon=iconname,
# category=category,
# result_type=Unity.ResultType.PERSONAL,
# mimetype=mimetype,
# title=titleorfilename,
# comment=abstract,
# dnd_uri=doc.url)
result_set.add_result( result_set.add_result(
uri=url, uri=url,
icon=iconname, icon=iconname,
@ -287,6 +274,7 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
def date_filter (self, filters): def date_filter (self, filters):
print("RecollScopeSearch: date_filter")
dateopt = "" dateopt = ""
f = filters.get_filter_by_id("modified") f = filters.get_filter_by_id("modified")
if f != None: if f != None:
@ -298,6 +286,7 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
dateopt = "P30D/" dateopt = "P30D/"
elif o.props.id == "last-7-days": elif o.props.id == "last-7-days":
dateopt = "P7D/" dateopt = "P7D/"
print("RecollScopeSearch: date_filter: return %s", dateopt)
return dateopt return dateopt
def catg_filter(self, filters): def catg_filter(self, filters):