Major changes

- xml repo config
- git submodules support (i fuck that make)
- build optionts add
- code style change
- not full pull
- pulling one dir or file
- another small fixes

Author: Cetttok

CMakeLists.txt

@@ -53,16 +53,15 @@ set(conky_sources ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/build.h)
 add_subdirectory(3rdparty)
 set(conky_libs ${conky_libs} toluapp_lib_static)
 set(conky_libs ${conky_libs} Vc)
-set(conky_libs ${conky_libs} PkgConfig::LIBGIT2)
 
 set(conky_includes ${conky_includes} "${CMAKE_SOURCE_DIR}/3rdparty/Vc")
 
 # Finally, add some code
 add_subdirectory(lua)
 add_subdirectory(data)
 add_subdirectory(doc)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2)
+# find_package(PkgConfig REQUIRED)
+# pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2)
 if(BUILD_EXTRAS)
   add_subdirectory(extras)
 endif(BUILD_EXTRAS)

cmake/ConkyBuildOptions.cmake

@@ -299,6 +299,12 @@ option(BUILD_PULSEAUDIO
 option(BUILD_INTEL_BACKLIGHT
   "Enable support for Intel backlight" false)
 
+option(BUILD_PRESETS "Enable theme presets support" true)
+
+set(PRESETS_REPO_URL "https://github.com/Cetttok/testRepoForConkyThemes")
+
+set(PRESETS_REPO_PATH "/var/lib/conky/themes")
+
 run_dependency_checks()
 
 message(STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS})

cmake/ConkyPlatformChecks.cmake

@@ -659,6 +659,14 @@ if(WANT_CURL)
   set(conky_includes ${conky_includes} ${CURL_INCLUDE_DIRS})
 endif(WANT_CURL)
 
+if(BUILD_PRESETS)
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2)
+  set(conky_libs ${conky_libs}  PkgConfig::LIBGIT2)
+  set(WANT_LIBXML2 true)
+endif(BUILD_PRESETS)
+
+
 if(WANT_LIBXML2)
   include(FindLibXml2)
 
@@ -738,3 +746,4 @@ if(DEBUG)
     OUTPUT_VARIABLE COMMIT_COUNT
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif(DEBUG)
+

cmake/config.h.in

@@ -21,6 +21,8 @@
 #define DEFAULT_TEXT_BUFFER_SIZE @DEFAULT_TEXT_BUFFER_SIZE@
 #define MAX_NET_INTERFACES @MAX_NET_INTERFACES@
 #define HTTPPORT @HTTPPORT@
+#define PRESETS_REPO_URL "@PRESETS_REPO_URL@"
+#define PRESETS_REPO_PATH "@PRESETS_REPO_PATH@"
 
 #cmakedefine BUILD_I18N 1
 
@@ -55,7 +57,7 @@
 #cmakedefine BUILD_MOUSE_EVENTS 1
 
 #cmakedefine BUILD_XDAMAGE 1
-
+#cmakedefine BUILD_PRESETS 1
 #cmakedefine BUILD_XINERAMA 1
 
 #cmakedefine BUILD_XFT 1

src/conky.cc

@@ -2156,12 +2156,12 @@ bool tryToReplaceAliasToPresetPath(std::string pathToPresetsRepo, std::string ur
   if (current_config.empty()){
     return false;
   }
-  SystemGitRepoSource dataSource = SystemGitRepoSource(pathToPresetsRepo/*"/var/lib/conky/themes"*/, urlToCloneRepo/*"https://github.com/Cetttok/testRepoForConkyThemes"*/);
-  if (!dataSource.loadThemesDb()){
+  advanced_git_repo_source dataSource = advanced_git_repo_source(pathToPresetsRepo/*"/var/lib/conky/themes"*/, urlToCloneRepo/*"https://github.com/Cetttok/testRepoForConkyThemes"*/);
+  if (!dataSource.load_themes_db()){
     return false;
   }
-  ThemesPresetManager presets(&dataSource);
-  std::string configPath = presets.getThemePath(current_config);
+  theme_presets_manager presets(&dataSource);
+  std::string configPath = presets.get_theme_path(current_config);
   if ( configPath.empty()){
     return false;
   }

src/main.cc

@@ -40,6 +40,10 @@
 #include "output/x11.h"
 #endif /* BUILD_X11 */
 
+#ifdef BUILD_PRESETS
+#include "themespresetmanager.h"
+#endif
+
 #ifdef BUILD_CURL
 #include "data/network/ccurl_thread.h"
 #endif /* BUILD_CURL */
@@ -69,7 +73,7 @@
 
 #ifdef BUILD_OLD_CONFIG
 #include "convertconf.h"
-#include "themespresetmanager.h"
+
 #endif /* BUILD_OLD_CONFIG */
 #endif /* BUILD_BUILTIN_CONFIG */
 
@@ -301,8 +305,8 @@ inline void reset_optind() {
   optind = 0;
 #endif
 }
-const char * THEME_PRESETS_REPO_CLONING_URL = "https://github.com/Cetttok/testRepoForConkyThemes"; // it is example need to create norm repo
-const char * THEME_PRESETS_REPO_PATH = "/var/lib/conky/themes";
+// const char * THEME_PRESETS_REPO_CLONING_URL = "https://github.com/Cetttok/testRepoForConkyThemes"; // it is example need to create norm repo
+// const char * THEME_PRESETS_REPO_PATH = "/var/lib/conky/themes";
 int main(int argc, char **argv) {
 #ifdef BUILD_I18N
   setlocale(LC_ALL, "");
@@ -337,9 +341,6 @@ int main(int argc, char **argv) {
     NORM_ERR("Can't set the specified locale!\nCheck LANG, LC_CTYPE, LC_ALL.");
   }
 #endif /* BUILD_X11 */
-  // SystemGitRepoSource* dataSource = new SystemGitRepoSource("newdatabase","https://github.com/Cetttok/testRepoForConkyThemes");
-  // ThemesPresetManager presets(dataSource);
-  // std::cout << argc << argv << getopt_string << longopts << std::endl;
   while (1) {
     int c = getopt_long(argc, argv, getopt_string, longopts, nullptr);
 
@@ -367,10 +368,6 @@ int main(int argc, char **argv) {
       case 'h':
         print_help(argv[0]);
         return 0;
-      // case 'S':
-      //   std::cout << "optarg " <<  optarg << std::endl;
-      //   std::cout << presets.getThemePath(std::string(optarg)) << std::endl;
-      //   break;
 #ifdef BUILD_BUILTIN_CONFIG
       case 'C':
         std::cout << defconfig;
@@ -399,24 +396,12 @@ int main(int argc, char **argv) {
     return 0;
   }
 #endif /* Linux || FreeBSD || Haiku || NetBSD || OpenBSD */
-  ////////
-  ///
-  ///
-  ///
-  ///
-  ///
-  ///
-  /// ///
-  /// ///
-  ///
-  ///
-  ///
-  ///
-  /// ////
 
   try {
     set_current_config();
-    tryToReplaceAliasToPresetPath(THEME_PRESETS_REPO_PATH, THEME_PRESETS_REPO_CLONING_URL );
+#ifdef BUILD_PRESETS
+    tryToReplaceAliasToPresetPath(PRESETS_REPO_PATH , PRESETS_REPO_URL);
+#endif
     state = std::make_unique<lua::state>();
 
     conky::export_symbols(*state);