Backup on migrate

Source/BuildGoFish.PRG

@@ -17,7 +17,7 @@ Cd (lcSourceLoc)
 
 *== Most of these local variables will make their way into BuildGoFish.h
 lcVersion = '6.0'
-lcBuild = '002' && <---- Set your desired version level of the tool here
+lcBuild = '003' && <---- Set your desired version level of the tool here
 && This will be used on the GoFish form and will live on the
 && the _GoFish object that gets attached to _Screen at run time.
 

Source/BuildGoFish.h

@@ -1,10 +1,10 @@
 	#DEFINE GOFISH_APP_NAME 'GoFish5'
 	#DEFINE GOFISH_APP_FILE  'GoFish5.app'
-	#DEFINE GOFISH_VERSION '6.0.002'
-	#DEFINE GOFISH_BUILDDATE '8. M�rz 2023, '
-	#DEFINE GOFISH_DBUILDDATE Date(2023,3, 8)
+	#DEFINE GOFISH_VERSION '6.0.003'
+	#DEFINE GOFISH_BUILDDATE '10. M�rz 2023, '
+	#DEFINE GOFISH_DBUILDDATE Date(2023,3, 10)
 	#DEFINE GOFISH_DOWNLOAD_URL 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip'
-	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish5 - 6.0.002 - 8. M�rz 2023,  - 20230308'
+	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish5 - 6.0.003 - 10. M�rz 2023,  - 20230310'
 	#DEFINE THOR_TOOL_NAME	'Thor_Tool_GoFish5'
 	#DEFINE VERSON_FILE_URL	'https://github.com/VFPX/GoFish/_GoFishVersionFile.txt'
 	#DEFINE VERSION_LOCAL_FILE 'GoFishVersionFile.txt'

Source/Changelog_Thor.txt

@@ -1,6 +1,6 @@
 GoFish Change Log
 
-## Ver 6.0.000  **Released 2023-03-08**
+## Ver 6.0.003  **Released 2023-03-10**
 For more details check https://github.com/VFPX/GoFish/docs/Changes.md
 - New: Mode to display history in tree
 - New: Modified structure to store history to speed up display of history in tree while keeeping common history table small.

Source/Prg/gofishproc.prg

@@ -1204,10 +1204,14 @@ Procedure GF_Move_GlobalPath  		&&Move GF settings from Home(7) to HOME(7)+"GoFi
 
 	loFSO = Createobject("Scripting.FileSystemObject")
 
-	lcSource = '"' + Home(7) + "GF_*.*" + '"'
-	lcTarget = '"' + Home(7) + "GoFish_\*.*" + '"'
+*	lcSource = '"' + Home(7) + "GF_*.*" + '"'
+*	lcTarget = '"' + Home(7) + "GoFish_ + '"'
 	Rename (m.lcSource) To (m.lcTarget)
 
+	lcSource = Home(7) + "GF_*.*"
+	lcTarget = Home(7) + "GoFish_"
+	loFSO.MoveFile(m.lcSource, m.lcTarget)
+
 	lcSource = Home(7) + "GF_Saved_Search_Results"
 	If Directory(m.lcSource) Then
 		lcTarget = Home(7) + "GoFish_\GF_Saved_Search_Results"
@@ -1224,6 +1228,45 @@ Procedure GF_Move_GlobalPath  		&&Move GF settings from Home(7) to HOME(7)+"GoFi
 
 Endproc &&GF_Move_GlobalPath
 
+Procedure GF_Backup_GlobalPath  		&&Move GF settings from Home(7) to HOME(7)+"GoFish\"
+	Local;
+		lcSource As String,;
+		lcTarget As String,;
+		lcTarget2 As String,;
+		lnLoop As Integer,;
+		loFSO  As "Scripting.FileSystemObject"
+
+	loFSO = Createobject("Scripting.FileSystemObject")
+
+	lcSource = Home(7) + "GF_*.*"
+	lcTarget = Home(7) + "GoFish_Backup"
+	lnLoop   = 0
+	Do While Directory(m.lcTarget)
+		lnLoop   = m.lnLoop+1
+		lcTarget = Home(7) + "GoFish_Backup_" +  Ltrim(Str(m.lnLoop,11,0))
+
+	Enddo &&DIRECTORY(m.lcTarget)
+	Mkdir (m.lcTarget)
+
+	lcTarget2 = '"' + m.lcTarget + "\*.*" + '"'
+	loFSO.CopyFile(m.lcSource, m.lcTarget)
+
+	lcSource = Home(7) + "GF_Saved_Search_Results"
+	If Directory(m.lcSource) Then
+		lcTarget2 = m.lcTarget + "\GF_Saved_Search_Results"
+
+		loFSO.CopyFolder(m.lcSource, m.lcTarget2)
+	Endif &&DIRECTORY(lcSource)
+
+	lcSource = Home(7) + "GoFishBackups"
+	If Directory(m.lcSource) Then
+		lcTarget2 = m.lcTarget + "\GoFishBackups"
+
+		loFSO.CopyFolder(m.lcSource, m.lcTarget2)
+	Endif &&DIRECTORY(lcSource)
+
+Endproc &&GF_Backup_GlobalPath
+
 Procedure GF_Write_Readme_Text  	&&Create for README.md files
 	Lparameters;
 		tnFile,;

Source/gofish.prg

@@ -55,6 +55,7 @@ lcSettingsFile = Addbs(Home(7)) + "GoFish_"
 If !Directory(m.lcSettingsFile) Then
 	Mkdir (Addbs(Home(7)) + "GoFish_")
 	If File(Addbs(Home(7)) + "GF_Results_Form_Settings.xml") Then
+	    GF_Backup_GlobalPath()
 		GF_Move_GlobalPath()
 	Endif &&File(Addbs(Home(7)) + "GF_Results_Form_Settings.xml")
 Endif &&DIRECTORY(m.lcSettingsFile)

_GoFishVersionFile.txt

@@ -3,7 +3,7 @@ Lparameters toUpdateInfo
 Text to lcNote NoShow
 GoFish Change Log
 
-## Ver 6.0.000  **Released 2023-03-08**
+## Ver 6.0.003  **Released 2023-03-10**
 For more details check https://github.com/VFPX/GoFish/docs/Changes.md
 - New: Mode to display history in tree
 - New: Modified structure to store history to speed up display of history in tree while keeeping common history table small.
@@ -20,7 +20,7 @@ For more details check https://github.com/VFPX/GoFish/docs/Changes.md
 
 EndText
 
-AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish5 - 6.0.002 - 8. M�rz 2023,  - 20230308')
+AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish5 - 6.0.003 - 10. M�rz 2023,  - 20230310')
 AddProperty(toUpdateInfo, 'SourceFileUrl', 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip')
 AddProperty(toUpdateInfo, 'LinkPrompt', 'GoFish Home Page')
 AddProperty(toUpdateInfo, 'Link', 'https://github.com/VFPX/GoFish')

docs/Changes.md

@@ -9,7 +9,12 @@ Replaces the lists in
 - ChangeLog_Ver_5.txt
 
 ----
-## Ver 6.0.002
+## Ver 6.0.003
+**Released 2023-03-10**
+### Changes
+- New: Migrating will create a backup of old GoFish data in `Home(7) + "GoFish_Backup"`.
+
+## Ver 6.0.000
 **Released 2023-03-08**
 ### Changes
 For more details check [Changes on V6](./New_6.md).

docs/New_6.md

@@ -1,8 +1,8 @@
-# Changes in Version 6.0.2
+# Changes in 6.0
 Documentation of GoFish - An advanced code search tool for MS Visual Foxpro 9
 
 ## Purpose of this document
-This document list new function in Version 6.0.2.
+This document list new function in Version 6.0.3.
 
 ----
 ## Table of contents
@@ -31,8 +31,8 @@ This document list new function in Version 6.0.2.
     - [Replace back colour](#replace-back-colour)
 
 ## Basics
-The changes of this version try TO add functions to GoFish, that are uesful in *Code References*.
-Mainly settings pre resource and history in tree.   
+The changes of this version try add functions to GoFish, that are uesfull in *Code References*.
+Mainly settings pre ressource and history in tree.   
 A lot of boolean expressions in the form `lVar = .T.` or `lVar = .F.` are replaced with the short form.
 
 ## Stored settings
@@ -41,14 +41,12 @@ The storage structure in version pre-dating 6.0 used a couple of files directly
 For better clearance, the User storage is now moved to `HOME(7)+"\GoFish_"`.
 Deleting the folder or it's contents as a whole resets GoFish to factory values.   
 This could also be achieved using a startup parameter `"-Reset"`.   
-This will not clear local storages. Local storages will be reused as soon as the option local is turned on and the app is restarted.   
-**Note that VFP 9 and VFPA will use different folders for `HOME(7)`**
+This will not clear local storages. Local storages will be reused as soon as the option local is turned on and the app is restarted.
 ### Project storage
 Depending on the personal style of development some prefer to have distinct IDE per project.
 On this, it's very odd to mix up search history between projects.
 A new option (Page: Advanced / *Local settings / storage*) allows to store depending of the resource file (FoxUser.dbf) loaded.
 By default, it stores to `Justpath(Set("Resource",1))+"\GoFish_"`. The location might be altered on the same page.   
-Deleting the folder or it's contents as a whole resets GoFish to factory values for this resource file.   
 This could also be achieved using a startup parameter `"-Resetlocal"`.   
 Since the location of a local store is stored in the resource file, so the location of the local storage will be kept.
 #### Data need to use Project storage
@@ -66,11 +64,16 @@ The storage data could be cleared by calling `Do GoFish5.app WITH "-Clear"` this
 GoFish will determine if folder `HOME(7)+"\GoFish_"` exists.
 If not, it will start to transform and move settings from `HOME(7)` to `HOME(7)+"\GoFish_"`, deleting the old files.   
 The new style will show replace information inline of historical search hits.
-The migration can not merge replace history and search history,
-so the replaces from the old version are available through *View Replace History* only.
+The migration can not merge replace history/ and search history,
+so the replaces from the old version are available throug *View Replace History* only.
+#### Backup
+(Version 6.0.3)   
+The files pre Version 6 will be duplicated to backup folder `Home(7) + "GoFish_Backup"`.
+Deleting the folder `Home(7) + "GoFish_"` and moving these files back to `Home(7)` will allow to work with old versions.
+Multiple updates will create numbered backup folders.
 #### Parallel use of old versions
 Since v6.0 GoFish will not migrate old data again as long as the folder `HOME(7)+"\GoFish_"` exists,
-the use of older versions does not interfere with GoFish once migrated.
+the use of older versions does not interfer with GoFish once migrated.
 
 ## Treeview
 Some changes are made to allow the Treeview better fit to personal style.
@@ -79,9 +82,9 @@ This is in special (All settings on Page: Code References)
 ### Context menu
 The tree offers a context menu to clear or refresh searches, or to change the sort order.   
 It is possible to refresh all previous (and visible) searches, but keep in mind this could take a while.
-Any way, I found it very useful while reworking projects.   
+Any way, I found it very usefull while reworking projects.   
 If the grid is showing the replace history, the function will clear replace backups.   
-Clearing search or clearing replace will not interfere with the other,
+Clearing search or clearing replace will not interfer with the other,
 records that are both saved and replaced will only be filtered from the respective view.
 ### History
 Allows the tree to show old searches. Note that the result set might be limited by active scope, see [below](#search-history).
@@ -104,14 +107,14 @@ A sub option *Sort Tree by extension first* allows to group the results a bit.
 The replace function is only active for the recent (Not: most recent) search.   
 New: The restore history will follow the search history, so one can see previous replaces on history searches.
 ### Altered functions
-The *Replace View* Checkbox in the bar above the grid opens a replace area. This is independent of enabling the Replace mode.
+The *Replace View* Checkbox in the bar above the grid opens a replace area. This is independend of enableing the Replace mode.
 If the view is visible, previously replaced records in the active or in in restored searches are highlighted inside the grid.
 Setting the Radio Box to *View Replace History* switches the whole form to display previous replaces.   
 The *Preview* allows to see the result of the *Replace Text* function before replacing.
-The old version used this as the only way, but it was a bit slow on large result sets.
+The hold version used this as the only way, but it was a bit slow on large result sets.
 ### Grid context menu
-If a record in the grid is replaced and a backup is created, the backup-folder of the replace is available via the context menu of the grid.
-This is independent of the state of *Replace View*.
+If a record in the grid is replaced and a backup is created, the backup-folder of the replace is available via the contextmenu of the grid.
+This is independend of the state of *Replace View*.
 
 ## Using
 ### Pick a scope
@@ -143,8 +146,8 @@ this is changed from visual to code based.
 Due to this, the column information stored will not survive version change.
 #### Visibility
 The page *Column Selection* on options form is reordered and suppresses fields with internal function.
-They could be turned on by a change in source code, there is a define `dlDebug` in `GF_ResultsForm.FormatGrid`.   
+They could bw turned on by a change in source code, there is a define `dlDebug` in `GF_ResultsForm.FormatGrid`.   
 A way to set the grid to default is added. Fields belonging to the replace function are highlighted in *Replaced* back colour.
 
 ----
-Last changed: _2023/03/08_  ![Picture](./pictures/vfpxpoweredby_alternative.gif)
+Last changed: _2023/03/10_  ![Picture](./pictures/vfpxpoweredby_alternative.gif)

readme.md

@@ -1,6 +1,6 @@
 # ![](content/home.png "Home") GoFish!
 ![Go!Fish](./docs/Screenshots/GoFish_image_8.png)   
-**Version 6.0.002, 2023-03-08**   
+**Version 6.0.003, 2023-03-10**   
 GoFish is an advanced code search tool for fast searching and replacing of Visual FoxPro source code.
 > Note: Matt's original repository is at https://github.com/mattslay/GoFish but since he sadly passed away in 2021, this fork is now the one the VFPX project list links to so others can contribute to the project. The main project is now https://github.com/VFPX/GoFish
 
@@ -52,4 +52,4 @@ The search brings one hit per line, even if there is more then one hit in this l
 The replace function just replaces all hits per line. There is not hint about multiple hits at all.
 
 ----
-Last changed: _2023/03/08_  ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif)
+Last changed: _2023/03/10_  ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif)