bluefish-svn Mailing List for Bluefish

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9215
          http://sourceforge.net/p/bluefish/code/9215
Author:   oli4
Date:     2025-12-07 22:57:07 +0000 (Sun, 07 Dec 2025)
Log Message:
-----------
fix proper directory creation in appdata/roaming and fix autosave to use the correct directory

Modified Paths:
--------------
    trunk/bluefish/src/bluefish.h
    trunk/bluefish/src/file_autosave.c
    trunk/bluefish/src/paths_state_config.c

Modified: trunk/bluefish/src/bluefish.h
===================================================================

--- trunk/bluefish/src/bluefish.h	2025-12-04 21:15:00 UTC (rev 9214)
+++ trunk/bluefish/src/bluefish.h	2025-12-07 22:57:07 UTC (rev 9215)
@@ -65,7 +65,11 @@
 #endif
 
 #ifdef DEBUG
+#ifdef WIN32
+#define DEBUG_MSG g_message
+#else
 #define DEBUG_MSG g_print
+#endif
 #define DEBUG_MSG_C g_critical
 #define DEBUG_MSG_E g_error
 #define DEBUG_MSG_W g_warning

Modified: trunk/bluefish/src/file_autosave.c
===================================================================
--- trunk/bluefish/src/file_autosave.c	2025-12-04 21:15:00 UTC (rev 9214)
+++ trunk/bluefish/src/file_autosave.c	2025-12-07 22:57:07 UTC (rev 9215)
@@ -118,7 +118,8 @@
 		main_v->props.autosave_location_mode = 0;
 	}
 	if (main_v->props.autosave_location_mode == 0 || doc->uri == NULL) {
-		gchar *path, *dir = g_strconcat(g_get_home_dir(), "/." PACKAGE "/autosave/", NULL);
+		gchar *path, *dir;
+		dir = paths_autosavedir_char();
 		if (doc->uri) {
 			gchar *base = g_file_get_basename(doc->uri);
 			path = unique_path(dir, base, excludehash);

Modified: trunk/bluefish/src/paths_state_config.c
===================================================================
--- trunk/bluefish/src/paths_state_config.c	2025-12-04 21:15:00 UTC (rev 9214)
+++ trunk/bluefish/src/paths_state_config.c	2025-12-07 22:57:07 UTC (rev 9215)
@@ -24,6 +24,8 @@
 
 On Windows64 this uses %USER%/.bluefish/
 */
+#define DEBUG
+
 #include "bluefish.h"
 #include "paths_state_config.h"
 
@@ -63,7 +65,7 @@
 GFile *get_gfile_for_dir_filename(REFKNOWNFOLDERID folder_id, gchar *filename) {
 	gchar *dir, *path;
 	GFile *file; 
-	dir = get_known_folder(&FOLDERID_RoamingAppData);
+	dir = get_known_folder(folder_id);
 	path = g_strconcat(dir,"/"PACKAGE"/", filename, NULL);
 	file = g_file_new_for_path(path);
 	g_free(path);
@@ -83,7 +85,7 @@
 }
 
 gchar *paths_autosavedir_char() {
-	return g_strconcat(get_known_folder(&FOLDERID_LocalAppData), "/." PACKAGE "/autosave/", NULL);
+	return g_strconcat(get_known_folder(&FOLDERID_LocalAppData), "/" PACKAGE "/autosave/", NULL);
 }
 
 GFile *paths_templatesdir_gfile() {
@@ -90,16 +92,50 @@
 	return get_gfile_for_dir_filename(&FOLDERID_LocalAppData, "templates/");
 }
 gchar *paths_datadir_char(const gchar *filename) {
-	return g_strconcat(get_known_folder(&FOLDERID_LocalAppData), "/."PACKAGE"/",filename,NULL);
+	return g_strconcat(get_known_folder(&FOLDERID_LocalAppData), "/"PACKAGE"/",filename,NULL);
 }
 void paths_create_dirs_and_migrate() {
 	gchar *dir;
-	dir = paths_autosavedir_char();
+	GFile *src, *dst;
+	gchar *chardst;
+	dir = g_strconcat(get_known_folder(&FOLDERID_RoamingAppData), "/"PACKAGE, NULL);
+	DEBUG_MSG("paths_create_dirs_and_migrate, create %s\n",dir);
 	g_mkdir_with_parents(dir, 0755);
 	g_free(dir);
-	dir = g_strconcat(get_known_folder(&FOLDERID_LocalAppData), "/." PACKAGE "/templates/", NULL);
+	
+	dir = g_strconcat(get_known_folder(&FOLDERID_LocalAppData), "/" PACKAGE "/templates/", NULL);
+	DEBUG_MSG("paths_create_dirs_and_migrate, create %s\n",dir);
 	g_mkdir_with_parents(dir, 0755);
 	g_free(dir);
+
+	/* we will not create the autosave dir. 
+	if it does not exist, the autosave code 
+	will do the migration code itself */
+	
+	src = user_bfdir(CURCONFIG);
+	dst = paths_config_gfile();
+	g_file_copy(src,dst,0, NULL, NULL, NULL, NULL);
+	g_object_unref(src);
+	g_object_unref(dst);
+	
+	src = user_bfdir(CURSESSION);
+	dst = paths_session_gfile();
+	g_file_copy(src,dst,0, NULL, NULL, NULL, NULL);
+	g_object_unref(src);
+	g_object_unref(dst);
+
+	/* we do not migrate autosave files, the autosave code will handle that for us */
+	
+	/* we need to migrate snippets */
+	src = user_bfdir("snippets");
+	chardst = paths_datadir_char("snippets");
+	dst = g_file_new_for_path(chardst);
+	g_file_copy(src,dst,0, NULL, NULL, NULL, NULL);
+	g_object_unref(src);
+	g_object_unref(dst);
+	g_free(chardst);
+	
+	/* do we need to migrate templates ? or make the user handle that him/herself? */
 }
 
 #elif PLATFORM_DARWIN
@@ -112,10 +148,10 @@
 	return user_bfdir(CURSESSION);
 }
 gchar *paths_autosavejournaldir_char() {
-	return g_strconcat(g_get_home_dir(), "/." PACKAGE "/", NULL);
+	return g_strconcat(g_get_home_dir(), "/" PACKAGE "/", NULL);
 }
 gchar *paths_autosavedir_char() {
-	return g_strconcat(g_get_home_dir(), "/." PACKAGE "/autosave/", NULL);
+	return g_strconcat(g_get_home_dir(), "/" PACKAGE "/autosave/", NULL);
 }
 
 GFile *paths_templatesdir_gfile() {
@@ -122,14 +158,16 @@
 	return user_bfdir("templates/");
 }
 gchar *paths_datadir_char(const gchar *filename) {
-	return g_strconcat(g_get_home_dir(), "/."PACKAGE"/",filename,NULL);
+	return g_strconcat(g_get_home_dir(), "/"PACKAGE"/",filename,NULL);
 }
 void paths_create_dirs_and_migrate() {
 	gchar *dir;
+	GFile *src, *dst;
+	gchar *chardst;
 	dir = paths_autosavedir_char();
 	g_mkdir_with_parents(dir, 0755);
 	g_free(dir);
-	dir = g_strconcat(g_get_home_dir(), "/." PACKAGE "/templates/", NULL);
+	dir = g_strconcat(g_get_home_dir(), "/" PACKAGE "/templates/", NULL);
 	g_mkdir_with_parents(dir, 0755);
 	g_free(dir);
 	

This was sent by the svnnotify hook on the bluefish svn repository.





2015	Jan	Feb	Mar	Apr	May (23)	Jun (37)	Jul (5)	Aug (8)	Sep (6)	Oct (6)	Nov (22)	Dec (2)
2016	Jan (14)	Feb (3)	Mar (3)	Apr (7)	May (1)	Jun (6)	Jul	Aug	Sep (1)	Oct (18)	Nov (1)	Dec (9)
2017	Jan (40)	Feb (1)	Mar	Apr (1)	May (4)	Jun (10)	Jul (3)	Aug (6)	Sep (7)	Oct (22)	Nov (5)	Dec (3)
2018	Jan	Feb (6)	Mar (1)	Apr (1)	May	Jun (1)	Jul (1)	Aug (3)	Sep (4)	Oct (5)	Nov (1)	Dec (2)
2019	Jan	Feb (1)	Mar (3)	Apr (1)	May	Jun	Jul	Aug (2)	Sep (12)	Oct (3)	Nov	Dec
2020	Jan (22)	Feb (6)	Mar (5)	Apr (2)	May (4)	Jun (3)	Jul (1)	Aug (4)	Sep (3)	Oct (2)	Nov (6)	Dec (2)
2021	Jan (3)	Feb	Mar (2)	Apr	May (2)	Jun	Jul (1)	Aug (1)	Sep (2)	Oct	Nov (1)	Dec (1)
2022	Jan	Feb (1)	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2023	Jan (31)	Feb (4)	Mar (4)	Apr (18)	May (14)	Jun (12)	Jul (14)	Aug (6)	Sep (2)	Oct	Nov (2)	Dec (1)
2024	Jan (3)	Feb (2)	Mar (16)	Apr (3)	May (2)	Jun (1)	Jul (7)	Aug (24)	Sep (25)	Oct (4)	Nov	Dec (3)
2025	Jan (6)	Feb (4)	Mar (19)	Apr	May (3)	Jun	Jul	Aug (15)	Sep (14)	Oct (24)	Nov (17)	Dec (7)

bluefish-svn Mailing List for Bluefish

bluefish-svn — Bluefish SVN commits