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

unity scope: worked on filters. Not much joy

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-11-07 16:24:28 +01:00
parent 51ce8736fc
commit fab98b8bd4
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,15 @@ _ = gettext.gettext
THEME = "/usr/share/icons/unity-icon-theme/places/svg/" THEME = "/usr/share/icons/unity-icon-theme/places/svg/"
UNITY_TYPE_TO_RECOLL_CLAUSE = {
"documents" : "rclcat:message rclcat:spreadsheet rclcat:text",
"folders" : "mime:inode/directory",
"images" : "rclcat:media",
"audio":"rclcat:media",
"videos":"rclcat:media",
"presentations" : "rclcat:presentation",
"other":"rclcat:other"
}
# Icon names for some recoll mime types which don't have standard icon by the # Icon names for some recoll mime types which don't have standard icon by the
# normal method # normal method
@ -216,7 +225,8 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
if not is_global: if not is_global:
catgf = self.catg_filter(filters) catgf = self.catg_filter(filters)
datef = self.date_filter(filters) datef = self.date_filter(filters)
" ".join((search_string, catgf, datef)) sizef = self.size_filter(filters)
search_string = " ".join((search_string, catgf, datef, sizef))
print("RecollScopeSearch::do_run: Search: [%s]" % search_string) print("RecollScopeSearch::do_run: Search: [%s]" % search_string)
@ -281,20 +291,22 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
def date_filter (self, filters): def date_filter (self, filters):
print("RecollScopeSearch: date_filter") #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:
o = f.get_active_option() o = f.get_active_option()
if o != None: if o != None:
if o.props.id == "last-year": if o.props.id == "last-year":
dateopt="P365D/" dateopt="date:P1Y/"
elif o.props.id == "last-30-days": elif o.props.id == "last-30-days":
dateopt = "P30D/" dateopt = "date:P1M/"
elif o.props.id == "last-7-days": elif o.props.id == "last-7-days":
dateopt = "P7D/" dateopt = "date:P7D/"
print("RecollScopeSearch: date_filter: return %s", dateopt) #print("RecollScopeSearch: date_filter: return [%s]" % dateopt)
return dateopt # Until we fix the recoll bug:
# return dateopt
return ""
def catg_filter(self, filters): def catg_filter(self, filters):
f = filters.get_filter_by_id("type") f = filters.get_filter_by_id("type")
@ -302,11 +314,27 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
if not f.props.filtering: if not f.props.filtering:
return "" return ""
ss = "" ss = ""
# ("media", "message", "presentation", "spreadsheet", "text", "other") for fopt in f.options:
for ftype in f.options: print(fopt.props.id, file=sys.stderr)
if f.get_option(ftype).props.active: if fopt.props.active:
ss += " rclcat:" + option.props.id if fopt.props.id in UNITY_TYPE_TO_RECOLL_CLAUSE:
ss += " " + UNITY_TYPE_TO_RECOLL_CLAUSE[fopt.props.id]
print("RecollScopSearch: catg_filter: [%s]" % ss)
return ss
def size_filter(self, filters):
print("size_filter", file=sys.stderr)
f = filters.get_filter_by_id("size")
if not f: return ""
print("size_filter got f", file=sys.stderr)
if not f.props.filtering:
return ""
print("size_filter f filtering", file=sys.stderr)
ss = ""
for fopt in f.options:
print(fopt.props.id, file=sys.stderr)
print("RecollScopeSearch: size_filter: [%s]" % ss)
return ss return ss
# Send back a useful icon depending on the document type # Send back a useful icon depending on the document type