lua fix dt.collection not working

sydidelot · May 8, 2016 · b049621 · b049621
1 parent 85827aa
commit b049621
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 36 deletions.
diff --git a/src/common/collection.c b/src/common/collection.c
@@ -507,6 +507,28 @@ GList *dt_collection_get_all(const dt_collection_t *collection, int limit)
   return list;
 }
 
+int dt_collection_get_nth(const dt_collection_t *collection, int nth)
+{
+  if(nth < 0 || nth >= dt_collection_get_count(collection))
+    return -1;
+  const gchar *query = dt_collection_get_query(collection);
+  sqlite3_stmt *stmt = NULL;
+  DT_DEBUG_SQLITE3_PREPARE_V2(dt_database_get(darktable.db), query, -1, &stmt, NULL);
+  DT_DEBUG_SQLITE3_BIND_INT(stmt, 1, nth);
+  DT_DEBUG_SQLITE3_BIND_INT(stmt, 2, 1);
+
+  int result = -1;
+  if(sqlite3_step(stmt) == SQLITE_ROW)
+  {
+    result  = sqlite3_column_int(stmt, 0);
+  }
+
+  sqlite3_finalize(stmt);
+
+  return result;
+
+}
+
 GList *dt_collection_get_selected(const dt_collection_t *collection, int limit)
 {
   GList *list = NULL;

diff --git a/src/common/collection.h b/src/common/collection.h
@@ -184,7 +184,8 @@ gchar *dt_collection_get_sort_query(const dt_collection_t *collection);
 
 /** get the count of query */
 uint32_t dt_collection_get_count(const dt_collection_t *collection);
-
+/** get the nth image in the query */
+int dt_collection_get_nth(const dt_collection_t *collection, int nth);
 /** get all image ids order as current selection. no more than limit many images are returned, <0 ==
  * unlimited */
 GList *dt_collection_get_all(const dt_collection_t *collection, int limit);

diff --git a/src/lua/database.c b/src/lua/database.c
@@ -197,44 +197,12 @@ static int collection_numindex(lua_State *L)
   {
     return luaL_error(L, "incorrect index in database");
   }
-
-  gchar *query = NULL;
-  gchar *sq = NULL;
-
-  /* get collection order */
-  if((darktable.collection->params.query_flags & COLLECTION_QUERY_USE_SORT))
-    sq = dt_collection_get_sort_query(darktable.collection);
-
-
-  sqlite3_stmt *stmt = NULL;
-
-  /* build the query string */
-  query = dt_util_dstrcat(query, "select distinct id from images ");
-
-  if(darktable.collection->params.sort == DT_COLLECTION_SORT_COLOR
-     && (darktable.collection->params.query_flags & COLLECTION_QUERY_USE_SORT))
-    query = dt_util_dstrcat(query, "as a left outer join color_labels as b on a.id = b.imgid ");
-
-  query = dt_util_dstrcat(query, "%s limit -1 offset ?1", sq);
-
-  DT_DEBUG_SQLITE3_PREPARE_V2(dt_database_get(darktable.db), query, -1, &stmt, NULL);
-  DT_DEBUG_SQLITE3_BIND_INT(stmt, 1, index -1);
-
-  if(sqlite3_step(stmt) == SQLITE_ROW)
-  {
-    int imgid = sqlite3_column_int(stmt, 0);
-    luaA_push(L, dt_lua_image_t, &imgid);
-    sqlite3_finalize(stmt);
-  }
-  else
+  int imgid = dt_collection_get_nth(darktable.collection,index-1);
+  if (imgid <1)
   {
-    g_free(sq);
-    g_free(query);
-    sqlite3_finalize(stmt);
     return luaL_error(L, "incorrect index in database");
   }
-  g_free(sq);
-  g_free(query);
+  luaA_push(L, dt_lua_image_t, &imgid);
   return 1;
 
 }