GNOME.org
 

[tracker/api-cleanup: 4/6] libtracker-miner: Move TrackerCrawler/Storage to libtracker-common

commit cb7ca5894f66421af325f9c85512f871de0e8ec1
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Jan 25 23:56:04 2014 +0100

    libtracker-miner: Move TrackerCrawler/Storage to libtracker-common
    
    These objects are used in multiple places, not necessarily related to
    miners. Furthermore, these objects are a bit out of place with the
    rest of the miner API as they aren't directly related to that task,
    and are already extensively wrapped in the places where they must, so
    they just happen to be convenient internal objects that we expose.
    
    Then, move these to libtracker-common, so they're available across
    Tracker, but only within it.
    
    All broken #includes resulting from this relocation have been fixed,
    and the tracker-crawler test moved with the libtracker-common ones.

 src/libtracker-common/Makefile.am                  |    6 ++++++
 .../tracker-accumulators.c}                        |    2 +-
 .../tracker-accumulators.h}                        |    0
 .../tracker-crawler.c                              |    2 +-
 .../tracker-crawler.h                              |    0
 .../tracker-storage.c                              |    2 +-
 .../tracker-storage.h                              |    0
 src/libtracker-miner/Makefile.am                   |   15 ++-------------
 src/libtracker-miner/tracker-decorator-fs.c        |    2 +-
 src/libtracker-miner/tracker-file-notifier.c       |    2 +-
 src/libtracker-miner/tracker-miner-fs.c            |    3 +--
 src/libtracker-miner/tracker-miner-manager.c       |    2 +-
 src/libtracker-miner/tracker-miner.h               |    2 --
 src/miners/fs/tracker-miner-files.c                |    1 +
 src/tracker-control/tracker-control-general.c      |    1 +
 src/tracker-extract/tracker-media-art.c            |    1 +
 src/tracker-writeback/tracker-writeback.c          |    1 +
 tests/libtracker-common/Makefile.am                |    4 ++++
 .../tracker-crawler-test.c                         |    2 +-
 tests/libtracker-miner/Makefile.am                 |    4 ----
 20 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 1ef66bf..f558ec8 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -18,7 +18,9 @@ endif
 libtracker_common_la_SOURCES = \
        $(BUILT_SOURCES) \
        $(os_sources) \
+       tracker-accumulators.c \
        tracker-config-file.c \
+       tracker-crawler.c \
        tracker-date-time.c \
        tracker-dbus.c \
        tracker-file-utils.c \
@@ -26,6 +28,7 @@ libtracker_common_la_SOURCES = \
        tracker-keyfile-object.c \
        tracker-log.c \
        tracker-sched.c \
+       tracker-storage.c \
        tracker-type-utils.c \
        tracker-utils.c \
        tracker-crc32.c \
@@ -33,6 +36,8 @@ libtracker_common_la_SOURCES = \
        tracker-media-art.c
 
 noinst_HEADERS = \
+       tracker-accumulators.h \
+       tracker-crawler.h \
        tracker-dbus.h \
        tracker-enums.h \
        tracker-ioprio.h \
@@ -45,6 +50,7 @@ noinst_HEADERS = \
        tracker-keyfile-object.h \
        tracker-ontologies.h \
        tracker-sched.h \
+       tracker-storage.h \
        tracker-type-utils.h \
        tracker-utils.h \
        tracker-crc32.h \
diff --git a/src/libtracker-miner/tracker-utils.c b/src/libtracker-common/tracker-accumulators.c
similarity index 97%
rename from src/libtracker-miner/tracker-utils.c
rename to src/libtracker-common/tracker-accumulators.c
index aec67b5..72efd50 100644
--- a/src/libtracker-miner/tracker-utils.c
+++ b/src/libtracker-common/tracker-accumulators.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "tracker-utils.h"
+#include "tracker-accumulators.h"
 
 gboolean
 tracker_accumulator_check_file (GSignalInvocationHint *hint,
diff --git a/src/libtracker-miner/tracker-utils.h b/src/libtracker-common/tracker-accumulators.h
similarity index 100%
rename from src/libtracker-miner/tracker-utils.h
rename to src/libtracker-common/tracker-accumulators.h
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-common/tracker-crawler.c
similarity index 99%
rename from src/libtracker-miner/tracker-crawler.c
rename to src/libtracker-common/tracker-crawler.c
index b73eebe..f5b1577 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-common/tracker-crawler.c
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "tracker-crawler.h"
-#include "tracker-utils.h"
+#include "tracker-accumulators.h"
 
 #define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, 
TrackerCrawlerPrivate))
 
diff --git a/src/libtracker-miner/tracker-crawler.h b/src/libtracker-common/tracker-crawler.h
similarity index 100%
rename from src/libtracker-miner/tracker-crawler.h
rename to src/libtracker-common/tracker-crawler.h
diff --git a/src/libtracker-miner/tracker-storage.c b/src/libtracker-common/tracker-storage.c
similarity index 99%
rename from src/libtracker-miner/tracker-storage.c
rename to src/libtracker-common/tracker-storage.c
index 557d002..39e142e 100644
--- a/src/libtracker-miner/tracker-storage.c
+++ b/src/libtracker-common/tracker-storage.c
@@ -27,7 +27,7 @@
 #include <libtracker-common/tracker-log.h>
 
 #include "tracker-storage.h"
-#include "tracker-utils.h"
+#include "tracker-accumulators.h"
 
 /**
  * SECTION:tracker-storage
diff --git a/src/libtracker-miner/tracker-storage.h b/src/libtracker-common/tracker-storage.h
similarity index 100%
rename from src/libtracker-miner/tracker-storage.h
rename to src/libtracker-common/tracker-storage.h
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 2629544..e083f4f 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -32,12 +32,6 @@ noinst_LTLIBRARIES = libtracker-miner-private.la
 libtracker_minerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-miner/
 
-crawler_sources =                                     \
-       tracker-crawler.c                              \
-       tracker-crawler.h                              \
-       tracker-utils.c                                \
-       tracker-utils.h                                 
-
 private_sources =                                     \
        tracker-file-notifier.h                        \
        tracker-file-notifier.c                        \
@@ -51,8 +45,6 @@ private_sources =                                    \
        tracker-task-pool.c                            \
        tracker-sparql-buffer.h                        \
        tracker-sparql-buffer.c                        \
-       tracker-storage.c                              \
-       tracker-storage.h                              \
        tracker-thumbnailer.c                          \
        tracker-thumbnailer.h
 
@@ -82,7 +74,6 @@ libtracker_miner_private_la_SOURCES =                  \
 libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES =    \
        $(network_provider_sources)                    \
        $(password_provider_sources)                   \
-       $(crawler_sources)                             \
        $(miner_sources)                               \
        tracker-indexing-tree.c                        \
        tracker-indexing-tree.h                        \
@@ -90,7 +81,6 @@ libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES =    \
        tracker-password-provider.c
 
 libtracker_minerinclude_HEADERS =                      \
-       tracker-crawler.h                              \
        tracker-decorator.h                            \
        tracker-decorator-fs.h                         \
        tracker-indexing-tree.h                        \
@@ -103,8 +93,7 @@ libtracker_minerinclude_HEADERS =                      \
        tracker-miner-manager.h                        \
        tracker-miner-web.h                            \
        tracker-network-provider.h                     \
-       tracker-password-provider.h                    \
-       tracker-storage.h
+       tracker-password-provider.h
 
 libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS =    \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -112,7 +101,7 @@ if !ENABLE_GCOV
 # Using enable_gcov instead of have_unit_test because when doing a release
 #  we disable gcov but NOT the unit tests
 libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS +=    \
-       -export-symbols-regex 
'^tracker_(miner|crawler|storage|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|decorator)_.*'
+       -export-symbols-regex 
'^tracker_(miner|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|decorator)_.*'
 endif
 
 libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD =     \
diff --git a/src/libtracker-miner/tracker-decorator-fs.c b/src/libtracker-miner/tracker-decorator-fs.c
index 65557f4..c56b5c9 100644
--- a/src/libtracker-miner/tracker-decorator-fs.c
+++ b/src/libtracker-miner/tracker-decorator-fs.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 
 #include <libtracker-common/tracker-ontologies.h>
-#include <libtracker-miner/tracker-storage.h>
+#include <libtracker-common/tracker-storage.h>
 
 #include "tracker-decorator-fs.h"
 
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index 9ef01aa..2cb3961 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -21,12 +21,12 @@
 
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-date-time.h>
+#include <libtracker-common/tracker-crawler.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-miner-common.h"
 #include "tracker-file-notifier.h"
 #include "tracker-file-system.h"
-#include "tracker-crawler.h"
 #include "tracker-monitor.h"
 
 static GQuark quark_property_crawled = 0;
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 7c7ef69..9d19ea4 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -24,12 +24,11 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-utils.h>
+#include <libtracker-common/tracker-crawler.h>
 
-#include "tracker-crawler.h"
 #include "tracker-miner-fs.h"
 #include "tracker-media-art.h"
 #include "tracker-monitor.h"
-#include "tracker-utils.h"
 #include "tracker-thumbnailer.h"
 #include "tracker-priority-queue.h"
 #include "tracker-task-pool.h"
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index ce1b79c..3585d42 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -23,8 +23,8 @@
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-type-utils.h>
+#include <libtracker-common/tracker-crawler.h>
 
-#include "tracker-crawler.h"
 #include "tracker-miner-object.h"
 #include "tracker-miner-manager.h"
 #include "tracker-miner-dbus.h"
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index d237529..1f7e9de 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -22,10 +22,8 @@
 
 #define __LIBTRACKER_MINER_H_INSIDE__
 
-#include <libtracker-miner/tracker-crawler.h>
 #include <libtracker-miner/tracker-decorator.h>
 #include <libtracker-miner/tracker-decorator-fs.h>
-#include <libtracker-miner/tracker-storage.h>
 #include <libtracker-miner/tracker-network-provider.h>
 #include <libtracker-miner/tracker-password-provider.h>
 #include <libtracker-miner/tracker-miner-object.h>
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index ea31eaf..21ddc3d 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -39,6 +39,7 @@
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-storage.h>
 
 #include <libtracker-data/tracker-db-manager.h>
 
diff --git a/src/tracker-control/tracker-control-general.c b/src/tracker-control/tracker-control-general.c
index a808bfd..aca0290 100644
--- a/src/tracker-control/tracker-control-general.c
+++ b/src/tracker-control/tracker-control-general.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <libtracker-common/tracker-common.h>
+#include <libtracker-common/tracker-crawler.h>
 #include <libtracker-data/tracker-data.h>
 #include <libtracker-miner/tracker-miner.h>
 
diff --git a/src/tracker-extract/tracker-media-art.c b/src/tracker-extract/tracker-media-art.c
index b438b63..d2e7826 100644
--- a/src/tracker-extract/tracker-media-art.c
+++ b/src/tracker-extract/tracker-media-art.c
@@ -39,6 +39,7 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-date-time.h>
 #include <libtracker-common/tracker-media-art.h>
+#include <libtracker-common/tracker-storage.h>
 
 #include "tracker-media-art.h"
 #include "tracker-extract.h"
diff --git a/src/tracker-writeback/tracker-writeback.c b/src/tracker-writeback/tracker-writeback.c
index 7435b0f..1b0b06d 100644
--- a/src/tracker-writeback/tracker-writeback.c
+++ b/src/tracker-writeback/tracker-writeback.c
@@ -21,6 +21,7 @@
 #include "tracker-writeback-module.h"
 
 #include <libtracker-common/tracker-common.h>
+#include <libtracker-common/tracker-storage.h>
 #include <libtracker-miner/tracker-miner.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index ad2662e..2ac897b 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
 noinst_PROGRAMS = $(TEST_PROGS)
 
 TEST_PROGS +=                                          \
+       tracker-crawler-test                           \
        tracker-type-utils                             \
        tracker-dbus                                   \
        tracker-file-utils                             \
@@ -15,6 +16,7 @@ TEST_PROGS +=                                          \
 AM_CPPFLAGS =                                      \
        -DTOP_SRCDIR=\"$(abs_top_srcdir)\"             \
        -DTOP_BUILDDIR=\"$(abs_top_builddir)\"         \
+       -DTEST_DATA_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/data"\" \
        $(BUILD_CFLAGS)                                \
        -I$(top_srcdir)/src                            \
        -I$(top_srcdir)/tests/common                   \
@@ -26,6 +28,8 @@ LDADD =                                                \
        $(BUILD_LIBS)                                  \
        $(LIBTRACKER_COMMON_LIBS)                      
 
+tracker_crawler_test_SOURCES = tracker-crawler-test.c
+
 tracker_dbus_SOURCES =                                 \
        tracker-dbus-test.c                            
 
diff --git a/tests/libtracker-miner/tracker-crawler-test.c b/tests/libtracker-common/tracker-crawler-test.c
similarity index 99%
rename from tests/libtracker-miner/tracker-crawler-test.c
rename to tests/libtracker-common/tracker-crawler-test.c
index e00801a..0fe00c6 100644
--- a/tests/libtracker-miner/tracker-crawler-test.c
+++ b/tests/libtracker-common/tracker-crawler-test.c
@@ -21,7 +21,7 @@
 
 #include <locale.h>
 
-#include <libtracker-miner/tracker-miner.h>
+#include <libtracker-common/tracker-crawler.h>
 
 typedef struct CrawlerTest CrawlerTest;
 
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index e2c447f..507b769 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -15,7 +15,6 @@ noinst_LTLIBRARIES = libtracker-miner-tests.la
 noinst_PROGRAMS = $(TEST_PROGS)
 
 TEST_PROGS +=                                          \
-       tracker-crawler-test                           \
        tracker-file-notifier-test                     \
        tracker-file-system-test                       \
        tracker-miner-manager-test                     \
@@ -64,9 +63,6 @@ libtracker_miner_tests_la_LIBADD =                   \
        $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql- TRACKER_API_VERSION@.la \
        $(BUILD_LIBS)
 
-tracker_crawler_test_SOURCES = \
-       tracker-crawler-test.c
-
 tracker_miner_manager_test_SOURCES = \
        tracker-miner-manager-test.c \
        miners-mock.c \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]