Plugins-Commits October 2017

plugins-commits@lists.geany.org

1 participants
71 discussions

[geany/geany-plugins] 66c5e6: utils: Add C++ guards
by Colomban Wendling 16 Oct '17

16 Oct '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Oct 2017 07:11:27 UTC Commit: 66c5e6539b02daf998f036167ba3d9428615b97e https://github.com/geany/geany-plugins/commit/66c5e6539b02daf998f036167ba3d… Log Message: ----------- utils: Add C++ guards Modified Paths: -------------- utils/src/filelist.h Modified: utils/src/filelist.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -21,7 +21,11 @@ #include <glib.h> +G_BEGIN_DECLS + GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns); +G_END_DECLS + #endif /* GP_UTILS_FILELIST_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 53c2fb: Fix building the utils library on Windows
by Colomban Wendling 15 Oct '17

15 Oct '17

1 0

[geany/geany-plugins] 72b74d: utils: Put public functions in the "gp" namespace
by Colomban Wendling 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 15 Oct 2017 21:28:08 UTC Commit: 72b74d4101036c1e417f3afa820222f5b29f7db6 https://github.com/geany/geany-plugins/commit/72b74d4101036c1e417f3afa82022… Log Message: ----------- utils: Put public functions in the "gp" namespace Modified Paths: -------------- utils/src/filelist.c utils/src/filelist.h workbench/src/wb_project.c Modified: utils/src/filelist.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -172,7 +172,7 @@ static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS * @return GSList of matched files * **/ -GSList *filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, +GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns) { SCAN_DIR_PARAMS params; Modified: utils/src/filelist.h 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __UTILS_FILELIST_H__ -#define __UTILS_FILELIST_H__ +#ifndef GP_UTILS_FILELIST_H +#define GP_UTILS_FILELIST_H #include <glib.h> -GSList *filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, +GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns); -#endif +#endif /* GP_UTILS_FILELIST_H */ Modified: workbench/src/wb_project.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -494,7 +494,7 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) searchdir = get_combined_path(prj->filename, root->base_dir); root->file_count = 0; root->folder_count = 0; - lst = filelist_scan_directory(&(root->file_count), &(root->folder_count), + lst = gp_filelist_scan_directory(&(root->file_count), &(root->folder_count), searchdir, file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); g_free(searchdir); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 34f58a: utils: Small code style cleanup
by Colomban Wendling 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 15 Oct 2017 21:28:08 UTC Commit: 34f58a5679cc0be2cef500961f9af0a55519e944 https://github.com/geany/geany-plugins/commit/34f58a5679cc0be2cef500961f9af… Log Message: ----------- utils: Small code style cleanup Modified Paths: -------------- utils/src/filelist.c Modified: utils/src/filelist.c 15 lines changed, 6 insertions(+), 9 deletions(-) =================================================================== @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* - * Code for the WB_PROJECT structure. - */ #include <glib.h> #include <glib/gstdio.h> @@ -38,7 +35,8 @@ typedef struct GSList *ignored_dirs_list; GSList *ignored_file_list; GHashTable *visited_paths; -}SCAN_DIR_PARAMS; +} +ScanDirParams; /** Get precompiled patterns. @@ -90,7 +88,7 @@ static gboolean filelist_patterns_match(GSList *patterns, const gchar *str) /* Scan directory searchdir. Input and output parameters come from/go to params. */ -static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS *params) +static void filelist_scan_directory_int(const gchar *searchdir, ScanDirParams *params) { GDir *dir; gchar *locale_path = utils_get_locale_from_utf8(searchdir); @@ -133,7 +131,8 @@ static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS } else if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR)) { - if (filelist_patterns_match(params->file_patterns, utf8_name) && !filelist_patterns_match(params->ignored_file_list, utf8_name)) + if (filelist_patterns_match(params->file_patterns, utf8_name) && ! + filelist_patterns_match(params->ignored_file_list, utf8_name)) { params->file_count++; params->filelist = g_slist_prepend(params->filelist, g_strdup(utf8_filename)); @@ -175,9 +174,7 @@ static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns) { - SCAN_DIR_PARAMS params; - - memset(&params, 0, sizeof(params)); + ScanDirParams params = { 0 }; if (!file_patterns || !file_patterns[0]) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b7fb1a: Only automatically enable the utils library if a plugin uses it
by Colomban Wendling 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 15 Oct 2017 21:28:02 UTC Commit: b7fb1a977678b89161155eb167152fc79b714293 https://github.com/geany/geany-plugins/commit/b7fb1a977678b89161155eb167152… Log Message: ----------- Only automatically enable the utils library if a plugin uses it Modified Paths: -------------- Makefile.am build/utils.m4 build/workbench.m4 configure.ac Modified: Makefile.am 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled -I geanypy/m4 --insta AM_DISTCHECK_CONFIGURE_FLAGS = --with-geany-libdir='$${libdir}' SUBDIRS = po + +if ENABLE_UTILSLIB SUBDIRS += utils +endif if ENABLE_ADDONS SUBDIRS += addons Modified: build/utils.m4 39 lines changed, 27 insertions(+), 12 deletions(-) =================================================================== @@ -1,19 +1,34 @@ -AC_DEFUN([GP_CHECK_UTILSLIB], +AC_DEFUN([_GP_UTILSLIB_ARG], [ -dnl -dnl TODO: only build the library if any plugins using it are enabled -dnl AC_ARG_ENABLE([utilslib], [AS_HELP_STRING([--enable-utilslib], [Whether to use the utilities library [[default=auto]]])], [enable_utilslib=$enableval], [enable_utilslib=auto]) - AS_IF([test "x$enable_utilslib" != "xno"], [ - enable_utilslib=yes - GP_STATUS_FEATURE_ADD([Utility library], [$enable_utilslib]) - AC_CONFIG_FILES([ - utils/Makefile - utils/src/Makefile - ]) - ]) +]) + +dnl GP_CHECK_UTILSLIB(PluginName) +dnl Check for utils library +AC_DEFUN([GP_CHECK_UTILSLIB], +[ + AC_REQUIRE([_GP_UTILSLIB_ARG]) + AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" != no && + test "$enable_utilslib" != yes], + [AS_IF([test "$enable_utilslib" = "no"], + [AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" = yes], + [AC_MSG_ERROR([Plugin $1 depends on utilslib which is disabled])], + [m4_tolower(AS_TR_SH(enable_$1))=no])], + [enable_utilslib=yes])]) +]) + +AC_DEFUN([GP_COMMIT_UTILSLIB_STATUS], +[ + AS_IF([test "$enable_utilslib" = "yes"], + [AC_CONFIG_FILES([ + utils/Makefile + utils/src/Makefile + ])], + [enable_utilslib=no]) + AM_CONDITIONAL([ENABLE_UTILSLIB], [test "$enable_utilslib" = "yes"]) + GP_STATUS_FEATURE_ADD([Utility library], [$enable_utilslib]) ]) Modified: build/workbench.m4 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_WORKBENCH], [ GP_ARG_DISABLE([Workbench], [auto]) + GP_CHECK_UTILSLIB([Workbench]) GP_COMMIT_PLUGIN_STATUS([Workbench]) AC_CONFIG_FILES([ workbench/Makefile Modified: configure.ac 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,6 @@ GP_CHECK_CPPCHECK GP_CHECK_CFLAGS GP_CHECK_LDFLAGS GP_CHECK_MINGW -GP_CHECK_UTILSLIB dnl plugin checks GP_CHECK_ADDONS @@ -75,6 +74,8 @@ GP_CHECK_WEBHELPER GP_CHECK_WORKBENCH GP_CHECK_XMLSNIPPETS +GP_COMMIT_UTILSLIB_STATUS + AC_CONFIG_FILES([ Makefile po/Makefile.in -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 08cf93: workbench: on re-scan dir only regenerate tags for that dir, not for all.
by LarsDW223 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Sun, 15 Oct 2017 17:32:52 UTC Commit: 08cf93b1d92f4633200a5aadfbd0ad76e5bbd761 https://github.com/geany/geany-plugins/commit/08cf93b1d92f4633200a5aadfbd0a… Log Message: ----------- workbench: on re-scan dir only regenerate tags for that dir, not for all. On re-scan of a directory the tm tags for all directories of that project were re-generated. This caused a crash. The crash only occured if the project had more than one directory. Now, only the tm tags of the selected/re-scanned project are re-generated. Fixes #629. Modified Paths: -------------- workbench/src/wb_project.c Modified: workbench/src/wb_project.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -565,7 +565,7 @@ static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) /* Regenerate tags */ -static void wb_project_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED gpointer user_data) +static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED gpointer user_data) { GHashTableIter iter; gpointer key, value; @@ -611,7 +611,7 @@ guint wb_project_dir_rescan(WB_PROJECT *prj, WB_PROJECT_DIR *root) total = wb_project_get_file_count(prj); if (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_YES || (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_AUTO && total < 300)) { - g_slist_foreach(prj->directories, (GFunc)wb_project_regenerate_tags, NULL); + wb_project_dir_regenerate_tags(root, NULL); } return filenum; } @@ -642,7 +642,7 @@ void wb_project_rescan(WB_PROJECT *prj) if (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_YES || (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_AUTO && filenum < 300)) { - g_slist_foreach(prj->directories, (GFunc)wb_project_regenerate_tags, NULL); + g_slist_foreach(prj->directories, (GFunc)wb_project_dir_regenerate_tags, NULL); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e5ba8a: Windows installer: install util library
by Enrico Tröger 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Oct 2017 14:11:32 UTC Commit: e5ba8a780231e2d1f227299df843fb0d076bc1aa https://github.com/geany/geany-plugins/commit/e5ba8a780231e2d1f227299df843f… Log Message: ----------- Windows installer: install util library Modified Paths: -------------- build/geany-plugins.nsi Modified: build/geany-plugins.nsi 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -105,6 +105,9 @@ Section "!Program Files" SEC01 SectionIn RO 1 2 SetOverwrite ifnewer + SetOutPath "$INSTDIR\bin" + File /r "${RESOURCEDIR}\bin\libgeanypluginutils-0.dll" + SetOutPath "$INSTDIR\lib" File /r "${RESOURCEDIR}\lib\*.dll" @@ -154,6 +157,7 @@ SectionEnd Section Uninstall Delete "$INSTDIR\ReadMe.Dependencies.Geany-Plugins.txt" Delete "$INSTDIR\uninst-plugins.exe" + Delete "$INSTDIR\bin\libgeanypluginutils-0.dll" Delete "$INSTDIR\lib\geany\addons.dll" Delete "$INSTDIR\lib\geany\autoclose.dll" Delete "$INSTDIR\lib\geany\automark.dll" @@ -252,7 +256,7 @@ Section Uninstall Delete "$INSTDIR\bin\libicutest58.dll" Delete "$INSTDIR\bin\libicutu58.dll" Delete "$INSTDIR\bin\libicuuc58.dll" - Delete "$INSTDIR\bin\libidn-11.dll" + Delete "$INSTDIR\bin\libidn2-0.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll" Delete "$INSTDIR\bin\libjpeg-8.dll" @@ -330,6 +334,7 @@ Section Uninstall FindClose $0 ; only if empty + RMDir "$INSTDIR\bin" RMDir "$INSTDIR\lib\geany" RMDir "$INSTDIR\lib" RMDir "$INSTDIR\libexec" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bb0535: Windows installer: Add Workbench plugin
by Enrico Tröger 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Oct 2017 12:13:30 UTC Commit: bb05358d3b733bb390e5af824546cae06e6ada34 https://github.com/geany/geany-plugins/commit/bb05358d3b733bb390e5af824546c… Log Message: ----------- Windows installer: Add Workbench plugin And remove the icon removal of ProjectOrganizer plugin which does not ship its own icons any longer. Modified Paths: -------------- build/geany-plugins.nsi Modified: build/geany-plugins.nsi 15 lines changed, 14 insertions(+), 1 deletions(-) =================================================================== @@ -196,6 +196,7 @@ Section Uninstall Delete "$INSTDIR\lib\geany\treebrowser.dll" Delete "$INSTDIR\lib\geany\updatechecker.dll" Delete "$INSTDIR\lib\geany\webhelper.dll" + Delete "$INSTDIR\lib\geany\workbench.dll" Delete "$INSTDIR\lib\geany\xmlsnippets.dll" Delete "$INSTDIR\bin\ctags.exe" @@ -295,7 +296,11 @@ Section Uninstall Delete "$INSTDIR\bin\lua51.dll" Delete "$INSTDIR\bin\ssleay32.dll" - Delete "$INSTDIR\share\icons\hicolor\16x16\apps\prjorg-*.png" + Delete "$INSTDIR\share\icons\hicolor\16x16\apps\workbench-*.png" + Delete "$INSTDIR\share\icons\hicolor\24x24\apps\workbench-*.png" + Delete "$INSTDIR\share\icons\hicolor\32x32\apps\workbench-*.png" + Delete "$INSTDIR\share\icons\hicolor\48x48\apps\workbench-*.png" + Delete "$INSTDIR\share\icons\hicolor\scalable\apps\workbench-*.svg" RMDir /r "$INSTDIR\lib\enchant" RMDir /r "$INSTDIR\lib\engines" @@ -331,6 +336,14 @@ Section Uninstall RMDir "$INSTDIR\share\doc" RMDir "$INSTDIR\share\icons\hicolor\16x16\apps" RMDir "$INSTDIR\share\icons\hicolor\16x16" + RMDir "$INSTDIR\share\icons\hicolor\24x24\apps" + RMDir "$INSTDIR\share\icons\hicolor\24x24" + RMDir "$INSTDIR\share\icons\hicolor\32x32\apps" + RMDir "$INSTDIR\share\icons\hicolor\32x32" + RMDir "$INSTDIR\share\icons\hicolor\48x48\apps" + RMDir "$INSTDIR\share\icons\hicolor\48x48" + RMDir "$INSTDIR\share\icons\hicolor\scalable\apps" + RMDir "$INSTDIR\share\icons\hicolor\scalable" RMDir "$INSTDIR\share\icons\hicolor" RMDir "$INSTDIR\share\icons" RMDir "$INSTDIR\share\locale" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bc3884: Windows installer: curl now requires libidn2
by Enrico Tröger 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Oct 2017 12:12:35 UTC Commit: bc3884a39d3a3d217d0c64b3ecaefdc14584fdff https://github.com/geany/geany-plugins/commit/bc3884a39d3a3d217d0c64b3ecaef… Log Message: ----------- Windows installer: curl now requires libidn2 Modified Paths: -------------- build/gtk-bundle-from-msys2.sh Modified: build/gtk-bundle-from-msys2.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -45,7 +45,7 @@ libassuan libgcrypt libgpg-error libgit2 -libidn +libidn2 libjpeg-turbo libogg libsoup -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 23f182: Merge pull request #628 from LarsGit223/wb-usecommonlib
by Frank Lanitz 15 Oct '17

15 Oct '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 15 Oct 2017 11:42:33 UTC Commit: 23f18242fd554731de3938dc7be1a10a2af99b83 https://github.com/geany/geany-plugins/commit/23f18242fd554731de3938dc7be1a… Log Message: ----------- Merge pull request #628 from LarsGit223/wb-usecommonlib workbench: use commonlib. Modified Paths: -------------- workbench/src/Makefile.am workbench/src/utils.c workbench/src/wb_project.c Modified: workbench/src/Makefile.am 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -24,8 +24,9 @@ workbench_la_SOURCES = \ workbench_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Workbench\" -workbench_la_CFLAGS = $(AM_CFLAGS) -workbench_la_LIBADD = $(COMMONLIBS) - +workbench_la_CFLAGS = $(AM_CFLAGS) \ + -I$(top_srcdir)/utils/src +workbench_la_LIBADD = $(COMMONLIBS) \ + $(top_builddir)/utils/src/libgeanypluginutils.la include $(top_srcdir)/build/cppcheck.mk Modified: workbench/src/utils.c 48 lines changed, 0 insertions(+), 48 deletions(-) =================================================================== @@ -61,54 +61,6 @@ gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant) } -/** Check if a string matches a pattern. - * - * The function checks if @a str matches pattern @a patterns. - * - * @param patterns Pattern list. - * @param str String to check - * @return TRUE if str matches the pattern, FALSE otherwise - * - **/ -gboolean patterns_match(GSList *patterns, const gchar *str) -{ - GSList *elem = NULL; - foreach_slist (elem, patterns) - { - GPatternSpec *pattern = elem->data; - if (g_pattern_match_string(pattern, str)) - return TRUE; - } - return FALSE; -} - - -/** Get precompiled patterns. - * - * The function builds the precompiled patterns for @a patterns and returns them - * as a list. - * - * @param patterns NULL terminated string array of patterns. - * @return Pointer to GSList of patterns or NULL if patterns == NULL - * - **/ -GSList *get_precompiled_patterns(gchar **patterns) -{ - guint i; - GSList *pattern_list = NULL; - - if (!patterns) - return NULL; - - for (i = 0; patterns[i] != NULL; i++) - { - GPatternSpec *pattern_spec = g_pattern_spec_new(patterns[i]); - pattern_list = g_slist_prepend(pattern_list, pattern_spec); - } - return pattern_list; -} - - /** Combine an absolute and a relative path. * * The function combines the absolute path @a base with the relative path Modified: workbench/src/wb_project.c 113 lines changed, 6 insertions(+), 107 deletions(-) =================================================================== @@ -26,6 +26,7 @@ #endif #include <geanyplugin.h> +#include <../../utils/src/filelist.h> #include "wb_globals.h" #include "wb_project.h" #include "utils.h" @@ -222,86 +223,6 @@ static void wb_project_clear_idle_queue(GSList **queue) } -/* Get the list of files for root */ -static GSList *wb_project_dir_get_file_list(WB_PROJECT_DIR *root, const gchar *utf8_path, GSList *patterns, - GSList *ignored_dirs_patterns, GSList *ignored_file_patterns, GHashTable *visited_paths) -{ - GSList *list = NULL; - GDir *dir; - const gchar *child_name; - GSList *child = NULL; - GSList *children = NULL; - gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - gchar *real_path = utils_get_real_path(locale_path); - - dir = g_dir_open(locale_path, 0, NULL); - if (!dir || !real_path || g_hash_table_lookup(visited_paths, real_path)) - { - if (dir != NULL) - { - g_dir_close(dir); - } - g_free(locale_path); - g_free(real_path); - return NULL; - } - - g_hash_table_insert(visited_paths, real_path, GINT_TO_POINTER(1)); - - while ((child_name = g_dir_read_name(dir)) != NULL) - { - children = g_slist_prepend(children, g_strdup(child_name)); - } - - g_dir_close(dir); - - foreach_slist(child, children) - { - const gchar *locale_name; - gchar *locale_filename, *utf8_filename, *utf8_name; - - locale_name = child->data; - - utf8_name = utils_get_utf8_from_locale(locale_name); - locale_filename = g_build_filename(locale_path, locale_name, NULL); - utf8_filename = utils_get_utf8_from_locale(locale_filename); - - if (g_file_test(locale_filename, G_FILE_TEST_IS_DIR)) - { - GSList *lst; - - if (!patterns_match(ignored_dirs_patterns, utf8_name)) - { - lst = wb_project_dir_get_file_list(root, utf8_filename, patterns, ignored_dirs_patterns, - ignored_file_patterns, visited_paths); - if (lst) - { - root->folder_count++; - list = g_slist_concat(list, lst); - } - } - } - else if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR)) - { - if (patterns_match(patterns, utf8_name) && !patterns_match(ignored_file_patterns, utf8_name)) - { - root->file_count++; - list = g_slist_prepend(list, g_strdup(utf8_filename)); - } - } - - g_free(utf8_filename); - g_free(locale_filename); - g_free(utf8_name); - } - - g_slist_free_full(children, g_free); - g_free(locale_path); - - return list; -} - - /* Create a new project dir with base path "utf8_base_dir" */ static WB_PROJECT_DIR *wb_project_dir_new(const gchar *utf8_base_dir) { @@ -556,38 +477,25 @@ static guint wb_project_get_file_count(WB_PROJECT *prj) /* Rescan/update the file list of a project dir. */ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) { - GSList *pattern_list = NULL; - GSList *ignored_dirs_list = NULL; - GSList *ignored_file_list = NULL; - GHashTable *visited_paths; GSList *lst; GSList *elem = NULL; guint filenum = 0; gchar *searchdir; + gchar **file_patterns = NULL; wb_project_dir_remove_from_tm_workspace(root); g_hash_table_remove_all(root->file_table); - if (!root->file_patterns || !root->file_patterns[0]) - { - const gchar *all_pattern[] = { "*", NULL }; - pattern_list = get_precompiled_patterns((gchar **)all_pattern); - } - else + if (root->file_patterns && root->file_patterns[0]) { - pattern_list = get_precompiled_patterns(root->file_patterns); + file_patterns = root->file_patterns; } - ignored_dirs_list = get_precompiled_patterns(root->ignored_dirs_patterns); - ignored_file_list = get_precompiled_patterns(root->ignored_file_patterns); - - visited_paths = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); searchdir = get_combined_path(prj->filename, root->base_dir); root->file_count = 0; root->folder_count = 0; - lst = wb_project_dir_get_file_list - (root, searchdir, pattern_list, ignored_dirs_list, ignored_file_list, visited_paths); - g_hash_table_destroy(visited_paths); + lst = filelist_scan_directory(&(root->file_count), &(root->folder_count), + searchdir, file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); g_free(searchdir); foreach_slist(elem, lst) @@ -604,15 +512,6 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) g_slist_foreach(lst, (GFunc) g_free, NULL); g_slist_free(lst); - g_slist_foreach(pattern_list, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(pattern_list); - - g_slist_foreach(ignored_dirs_list, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(ignored_dirs_list); - - g_slist_foreach(ignored_file_list, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(ignored_file_list); - return filenum; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits October 2017