#include <atalk/unix.h>
#include "spotlight.h"
+#include "spotlight_rawquery_parser.h"
#define MAX_SL_RESULTS 20
static TrackerSparqlConnection *connection;
+static TrackerMinerManager *manager;
-char *tracker_to_unix_path(const char *uri)
+static char *tracker_to_unix_path(const char *uri)
{
EC_INIT;
GFile *f = NULL;
GError *error = NULL;
const char *msg = p;
- LOG(log_info, logtype_sl, "sl_mod_init: %s", msg);
+ LOG(log_info, logtype_sl, "Initializing Spotlight module");
g_type_init();
setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
become_root();
connection = tracker_sparql_connection_get(NULL, &error);
+ manager = tracker_miner_manager_new_full(FALSE, &error);
unbecome_root();
if (!connection) {
EC_FAIL;
}
-EC_CLEANUP:
- EC_EXIT;
-}
-
-/*!
- * Return talloced query from query string
- * *=="query*"
- */
-static const gchar *map_spotlight_to_sparql_query(slq_t *slq)
-{
- EC_INIT;
- const gchar *sparql_query;
- const char *sparql_query_format;
- const char *slquery = slq->slq_qstring;
- char *word, *p;
-
- LOG(log_debug, logtype_sl, "query_word_from_sl_query: \"%s\"", slquery);
-
- if ((word = strstr(slquery, "*==")) || (word = strstr(slquery, "kMDItemTextContent=="))) {
- /* Full text search */
- sparql_query_format = "SELECT nie:url(?uri) WHERE {?uri nie:url ?url . FILTER(fn:starts-with(?url, 'file://%s')) . ?uri fts:match '%s'}";
- EC_NULL_LOG( word = strchr(word, '"') );
- word++;
- EC_NULL( word = dalloc_strdup(slq, word) );
- EC_NULL_LOG( p = strchr(word, '"') );
- *p = 0;
- sparql_query = talloc_asprintf(slq, sparql_query_format, slq->slq_vol->v_path, word);
- LOG(log_debug, logtype_sl, "query_word_from_sl_query: \"%s\"", sparql_query);
- } else if ((word = strstr(slquery, "kMDItemDisplayName=="))) {
- /* Filename search */
- sparql_query_format = "SELECT ?url WHERE { ?x nie:url ?url ; nfo:fileName ?name FILTER(fn:starts-with(?url, 'file://%s/') && regex(?name, '%s')) }";
- EC_NULL_LOG( word = strchr(word, '"') );
- word++;
- EC_NULL( word = dalloc_strdup(slq, word) );
- EC_NULL_LOG( p = strchr(word, '"') );
- if (*(p-1) == '*')
- *(p-1) = 0;
- else
- *p = 0;
- sparql_query = talloc_asprintf(slq, sparql_query_format, slq->slq_vol->v_path, word);
- LOG(log_debug, logtype_sl, "query_word_from_sl_query: \"%s\"", sparql_query);
- } else {
- EC_FAIL_LOG("Can't parse SL query: '%s'", slquery);
+ if (!manager) {
+ LOG(log_error, logtype_sl, "Couldn't connect to Tracker miner");
+ g_clear_error(&error);
+ EC_FAIL;
}
EC_CLEANUP:
- if (ret != 0)
- sparql_query = NULL;
- return sparql_query;
+ EC_EXIT;
}
+
static void tracker_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
{
slq_t *slq = user_data;
{
EC_INIT;
slq_t *slq = p;
- const gchar *sparql_query;
+ gchar *sparql_query;
GError *error = NULL;
LOG(log_debug, logtype_sl, "sl_mod_start_search: Spotlight query string: \"%s\"", slq->slq_qstring);
- EC_NULL_LOG( sparql_query = map_spotlight_to_sparql_query(slq) );
+ EC_ZERO_LOGSTR( map_spotlight_to_sparql_query(slq, &sparql_query),
+ "Mapping Spotlight query failed: \"%s\"", slq->slq_qstring );
LOG(log_debug, logtype_sl, "sl_mod_start_search: SPARQL query: \"%s\"", sparql_query);
#if 0
sl_nil_t nil = 0;
int i, metacount;
- if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0)
- EC_FAIL;
+ if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0) {
+ dalloc_add_copy(fm_array, &nil, sl_nil_t);
+ goto EC_CLEANUP;
+ }
LOG(log_debug, logtype_sl, "add_filemeta: metadata count: %d", metacount);
sl_cnids_t *cnids;
sl_filemeta_t *fm;
sl_array_t *fm_array;
+ sl_nil_t nil;
uint64_t uint64;
- gboolean qres;
+ gboolean qres, firstmatch = true;
if (!slq->slq_tracker_cursor) {
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: no results found");
fm_array = talloc_zero(fm, sl_array_t);
dalloc_add(fm, fm_array, sl_array_t);
- /* For some reason the list of results always starts with a nil entry */
- sl_nil_t nil;
- dalloc_add_copy(fm_array, &nil, sl_nil_t);
-
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: now interating Tracker results cursor");
- while (i <= MAX_SL_RESULTS) {
+ while ((slq->slq_state == SLQ_STATE_RUNNING) && (i <= MAX_SL_RESULTS)) {
become_root();
qres = tracker_sparql_cursor_next(slq->slq_tracker_cursor, NULL, &error);
unbecome_root();
if (!qres)
break;
+ if (firstmatch) {
+ /* For some reason the list of results always starts with a nil entry */
+ dalloc_add_copy(fm_array, &nil, sl_nil_t);
+ firstmatch = false;
+ }
+
become_root();
uri = tracker_sparql_cursor_get_string(slq->slq_tracker_cursor, 0, NULL);
unbecome_root();
- LOG(log_debug, logtype_sl, "uri: \"%s\"", uri);
-
EC_NULL_LOG( path = tracker_to_unix_path(uri) );
if ((id = cnid_for_path(slq->slq_vol->v_cdb, slq->slq_vol->v_path, path, &did)) == CNID_INVALID) {
- LOG(log_error, logtype_sl, "sl_mod_fetch_result: cnid_for_path error");
+ LOG(log_error, logtype_sl, "sl_mod_fetch_result: cnid_for_path error: %s", path);
goto loop_cleanup;
}
LOG(log_debug, logtype_sl, "Result %d: CNID: %" PRIu32 ", path: \"%s\"", i, ntohl(id), path);
if (i < MAX_SL_RESULTS)
slq->slq_state = SLQ_STATE_DONE;
+ uint64 = (i > 0) ? 35 : 0; /* OS X AFP server returns 35 here if results are found */
+ dalloc_add_copy(slq->slq_reply, &uint64, uint64_t);
dalloc_add(slq->slq_reply, cnids, sl_cnids_t);
dalloc_add(slq->slq_reply, fm, sl_filemeta_t);
EC_CLEANUP:
- if (slq->slq_tracker_cursor) {
- if ((ret != 0) || (slq->slq_state == SLQ_STATE_DONE)) {
+ if (ret != 0) {
+ if (slq->slq_tracker_cursor) {
g_object_unref(slq->slq_tracker_cursor);
slq->slq_tracker_cursor = NULL;
}
static int sl_mod_index_file(const void *p)
{
#ifdef HAVE_TRACKER_MINER
- /* hangs in tracker_miner_manager_new_full() for whatever reason... */
- return 0;
-
EC_INIT;
const char *f = p;
if (!f)
goto EC_CLEANUP;
- TrackerMinerManager *manager;
GError *error = NULL;
- GFile *file;
-
- if ((manager = tracker_miner_manager_new_full(FALSE, &error)) == NULL) {
- LOG(log_error, logtype_sl, "sl_mod_index_file(\"%s\"): couldn't connect to Tracker miner", f);
- } else {
- file = g_file_new_for_commandline_arg(f);
- tracker_miner_manager_index_file(manager, file, &error);
- if (error)
- LOG(log_error, logtype_sl, "sl_mod_index_file(\"%s\"): indexing failed", f);
- else
- LOG(log_debug, logtype_sl, "sl_mod_index_file(\"%s\"): indexing file was successful", f);
- g_object_unref(manager);
- g_object_unref(file);
- }
+ GFile *file = NULL;
+
+ file = g_file_new_for_commandline_arg(f);
+
+ become_root();
+ tracker_miner_manager_index_file(manager, file, &error);
+ unbecome_root();
+
+ if (error)
+ LOG(log_error, logtype_sl, "sl_mod_index_file(\"%s\"): indexing failed", f);
+ else
+ LOG(log_debug, logtype_sl, "sl_mod_index_file(\"%s\"): indexing file was successful", f);
EC_CLEANUP:
+ if (file)
+ g_object_unref(file);
EC_EXIT;
#else
return 0;
projects / netatalk.git / blobdiff