Simplified version checking

Simplified dummy-db handling

Author: patrickTingen

DataDigger2.p

@@ -231,20 +231,17 @@ END.
 PROCEDURE createDummyDb :
 /* Create an empty dummy db
 */
-  DEFINE OUTPUT PARAMETER pcDummyDir AS CHARACTER NO-UNDO.
-
+  DEFINE OUTPUT PARAMETER pcDummyDb AS CHARACTER NO-UNDO.
   DEFINE VARIABLE cDatabase AS CHARACTER NO-UNDO.
 
   REPEAT:
-    pcDummyDir = SESSION:TEMP-DIR + 'DataDigger_' + STRING(ETIME).
-    FILE-INFORMATION:FILE-NAME = pcDummyDir.
+    pcDummyDb = "DD_" + STRING(ETIME).
+    cDatabase = SESSION:TEMP-DIR + pcDummyDb + ".db".
+    FILE-INFORMATION:FILE-NAME = cDatabase.
     IF FILE-INFORMATION:FULL-PATHNAME = ? THEN LEAVE.
   END.
 
-  OS-CREATE-DIR VALUE(pcDummyDir).
-  cDatabase = pcDummyDir + '\Empty.db'.
   CREATE DATABASE cDatabase FROM "EMPTY" REPLACE NO-ERROR.
-
   IF NOT ERROR-STATUS:ERROR THEN CONNECT VALUE(cDatabase) -1.
 
 END PROCEDURE. /* createDummyDb */
@@ -272,6 +269,29 @@ END PROCEDURE. /* DataDigger */
 
 &ENDIF
 
+&IF DEFINED(EXCLUDE-deleteDummyDb) = 0 &THEN
+
+&ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE deleteDummyDb Procedure 
+PROCEDURE deleteDummyDb :
+/* Create the empty dummy db
+*/
+  DEFINE INPUT PARAMETER pcDummyDb AS CHARACTER NO-UNDO.
+
+  DISCONNECT VALUE(pcDummyDb) NO-ERROR.
+
+  OS-DELETE VALUE(SESSION:TEMP-DIR + pcDummyDb + ".lg").
+  OS-DELETE VALUE(SESSION:TEMP-DIR + pcDummyDb + ".b1").
+  OS-DELETE VALUE(SESSION:TEMP-DIR + pcDummyDb + ".d1").
+  OS-DELETE VALUE(SESSION:TEMP-DIR + pcDummyDb + ".db").
+  OS-DELETE VALUE(SESSION:TEMP-DIR + pcDummyDb + ".st").
+
+END PROCEDURE. /* deleteDummyDb */
+
+/* _UIB-CODE-BLOCK-END */
+&ANALYZE-RESUME
+
+&ENDIF
+
 &IF DEFINED(EXCLUDE-getSourceFiles) = 0 &THEN
 
 &ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE getSourceFiles Procedure 
@@ -400,7 +420,7 @@ PROCEDURE recompileDataDigger :
   */
   DEFINE VARIABLE cSetting   AS CHARACTER   NO-UNDO.
   DEFINE VARIABLE lRecompile AS LOGICAL     NO-UNDO.
-  DEFINE VARIABLE cDummyDir  AS CHARACTER   NO-UNDO.
+  DEFINE VARIABLE cDummyDb   AS CHARACTER   NO-UNDO.
 
   /* You can specify in the settings that you do not want to compile
    * This can be useful when you use DD in multiple environments
@@ -427,11 +447,11 @@ PROCEDURE recompileDataDigger :
      * so getVersion.p can be compiled */
     IF NUM-DBS = 0 THEN 
     DO:
-      RUN createDummyDb(OUTPUT cDummyDir).
+      RUN createDummyDb(OUTPUT cDummyDb).
 
       IF NUM-DBS = 0 THEN 
       DO:
-        MESSAGE "Cannot create dummy database in folder" cDummyDir SKIP 
+        MESSAGE "Cannot create dummy database in folder" cDummyDb SKIP 
                 "DataDigger needs at least 1 connected db to compile." VIEW-AS ALERT-BOX INFO BUTTONS OK.
         OS-COMMAND NO-WAIT START 'https://github.com/patrickTingen/DataDigger/wiki/Problem-CannotCreateDummyDB'.
         STOP.
@@ -440,11 +460,8 @@ PROCEDURE recompileDataDigger :
 
     RUN recompileSelf.
 
-    IF cDummyDir <> '' THEN 
-    DO:
-      DISCONNECT "Empty" NO-ERROR.
-      OS-DELETE VALUE(cDummyDir) RECURSIVE.
-    END.
+    IF cDummyDb <> '' THEN 
+      RUN deleteDummyDb(cDummyDb).
 
     /* Force a restart of the library */
     RUN startDiggerLib(INPUT lRecompile).

build.i

@@ -1 +1 @@
-20180926
+20180928

checkVersion.p

@@ -17,73 +17,62 @@ DEFINE INPUT PARAMETER plManualCheck AS LOGICAL NO-UNDO.
 
 { DataDigger.i }
 
-DEFINE VARIABLE cLocalVersion  AS CHARACTER   NO-UNDO.
-DEFINE VARIABLE cLocalBuildNr  AS CHARACTER   NO-UNDO.
-DEFINE VARIABLE cRemoteVersion AS CHARACTER   NO-UNDO.
-DEFINE VARIABLE cRemoteBuildNr AS CHARACTER   NO-UNDO.
+DEFINE VARIABLE cLocalBuild    AS CHARACTER   NO-UNDO.
+DEFINE VARIABLE cRemoteBuild   AS CHARACTER   NO-UNDO.
 DEFINE VARIABLE cNewVersionUrl AS CHARACTER   NO-UNDO.
 DEFINE VARIABLE lVisit         AS LOGICAL     NO-UNDO INITIAL TRUE.
+DEFINE VARIABLE cStableBuild   AS CHARACTER   NO-UNDO.
 
 /* Might be spaces in the include file */
-cLocalVersion = TRIM('{version.i}').
-cLocalBuildNr = TRIM('{build.i}').
+cLocalBuild = TRIM('{build.i}').
 
 /* If channel is set to manual, but this is not a manual check then return. */
 IF piChannel = {&CHECK-MANUAL} AND NOT plManualCheck THEN RETURN.
 
+/* Get current stable build */
+RUN getVersionInfo.p(INPUT 'master', OUTPUT cStableBuild).
+
 /* Get proper version info, depending on channel */
-CASE piChannel:
-  WHEN {&CHECK-MANUAL} THEN RUN getVersionInfo.p(INPUT 'master' , OUTPUT cRemoteVersion, OUTPUT cRemoteBuildNr).
-  WHEN {&CHECK-STABLE} THEN RUN getVersionInfo.p(INPUT 'master' , OUTPUT cRemoteVersion, OUTPUT cRemoteBuildNr).
-  WHEN {&CHECK-BETA}   THEN RUN getVersionInfo.p(INPUT 'develop', OUTPUT cRemoteVersion, OUTPUT cRemoteBuildNr).
-END CASE.
+IF piChannel = {&CHECK-MANUAL} OR piChannel = {&CHECK-STABLE} THEN 
+DO:
+  /* If local build is newer than stable, set update channel to BETA */
+  IF cLocalBuild > cStableBuild THEN 
+  DO:
+    setRegistry("DataDigger:Update","UpdateChannel", "{&CHECK-BETA}").
+    piChannel = {&CHECK-BETA}.
+  END.
+  ELSE 
+    cRemoteBuild = cStableBuild.
+END.
+   
+IF piChannel = {&CHECK-BETA} THEN 
+  RUN getVersionInfo.p(INPUT 'develop', OUTPUT cRemoteBuild).
 
 /* If version cannot be determined then don't bother. Unless this is a manual check */
-IF cRemoteBuildNr = '' THEN
+IF cRemoteBuild = '' OR cRemoteBuild = ? THEN
 DO:
-  IF plManualCheck THEN MESSAGE 'Cannot reach version the DataDigger website' VIEW-AS ALERT-BOX INFORMATION BUTTONS OK.
+  IF plManualCheck THEN MESSAGE 'Cannot reach the DataDigger website' VIEW-AS ALERT-BOX INFORMATION BUTTONS OK.
   RETURN.
 END.
 
 /* Save remote version / build */
-setRegistry('DataDigger:Update', 'RemoteBuildNr', cRemoteBuildNr).
-setRegistry('DataDigger:Update', 'RemoteVersion', cRemoteVersion).
+setRegistry('DataDigger:Update', 'RemoteBuildNr', cRemoteBuild).
 
-/* If you are using a build that is newer than the production version, it means you are running a beta version.
- * Then force the update channel to 'beta'
- */
-IF (piChannel = {&CHECK-MANUAL} OR piChannel = {&CHECK-STABLE})
-  AND '{build.i}' > cRemoteBuildNr THEN setRegistry("DataDigger:Update","UpdateChannel", "{&CHECK-BETA}").
-
-/* New version? */
-IF cRemoteVersion > cLocalVersion THEN
+/* Check build to detect new versions */
+IF cRemoteBuild > cLocalBuild THEN
 DO:
-  cNewVersionUrl = 'https://github.com/patrickTingen/DataDigger/releases/latest'.
-  
-  IF plManualCheck THEN
-  DO:
-    MESSAGE 'A new version is available on the DataDigger website~n~nDo you want to check it?' VIEW-AS ALERT-BOX INFORMATION BUTTONS YES-NO-CANCEL UPDATE lVisit.
-    IF lVisit = TRUE THEN OS-COMMAND NO-WAIT START VALUE(cNewVersionUrl).
-  END.
+  IF piChannel = {&CHECK-MANUAL} OR piChannel = {&CHECK-STABLE} THEN 
+    cNewVersionUrl = 'https://github.com/patrickTingen/DataDigger/releases/latest'.
   ELSE 
-    setRegistry('DataDigger:Update', 'NewVersionURL', cNewVersionUrl).
-
-END.
-
-ELSE
-/* New BETA? */
-IF cRemoteBuildNr > cLocalBuildNr THEN
-DO:
-  cNewVersionUrl = 'https://github.com/patrickTingen/DataDigger/releases/'.
+    cNewVersionUrl = 'https://github.com/patrickTingen/DataDigger/releases/'.
 
   IF plManualCheck THEN
   DO:
-    MESSAGE 'A new BETA version is available on the DataDigger website~n~nDo you want to check it?' VIEW-AS ALERT-BOX INFORMATION BUTTONS YES-NO-CANCEL UPDATE lVisit.
+    MESSAGE 'A new version is available on the DataDigger website~n~nDo you want to check it?' VIEW-AS ALERT-BOX INFORMATION BUTTONS YES-NO-CANCEL UPDATE lVisit.
     IF lVisit = TRUE THEN OS-COMMAND NO-WAIT START VALUE(cNewVersionUrl).
   END.
   ELSE 
     setRegistry('DataDigger:Update', 'NewVersionURL', cNewVersionUrl).
-
 END.
 
 ELSE

getVersionInfo.p

@@ -1,18 +1,17 @@
 /*------------------------------------------------------------------------
 
   Name: getVersionInfo.p
-  Desc: Give back latest versions from DataDigger on GitHub
+  Desc: Give back latest buildnr from DataDigger on GitHub
 
-  Notes:
-    The version nr is increased when it is ready for production, the
-    build nr is increaded when something is ready for beta testing.
 ------------------------------------------------------------------------*/
 
 DEFINE INPUT  PARAMETER pcBranch  AS CHARACTER NO-UNDO.
-DEFINE OUTPUT PARAMETER pcVersion AS CHARACTER NO-UNDO.
 DEFINE OUTPUT PARAMETER pcBuildNr AS CHARACTER NO-UNDO.
 
 IF LOOKUP(pcBranch,'master,develop') = 0 THEN RETURN.
 
-RUN getRemoteFile.p(SUBSTITUTE('https://raw.githubusercontent.com/patrickTingen/DataDigger/&1/version.i', pcBranch), OUTPUT pcVersion).
-RUN getRemoteFile.p(SUBSTITUTE('https://raw.githubusercontent.com/patrickTingen/DataDigger/&1/build.i'  , pcBranch), OUTPUT pcBuildNr).
+RUN getRemoteFile.p
+  ( INPUT  SUBSTITUTE('https://raw.githubusercontent.com/patrickTingen/DataDigger/&1/build.i', pcBranch)
+  , OUTPUT pcBuildNr
+  ).
+  

wDataDigger.w

@@ -12419,7 +12419,6 @@ PROCEDURE startSession :
   DEFINE VARIABLE lUpgraded      AS LOGICAL   NO-UNDO.
   DEFINE VARIABLE lOpenBlog      AS LOGICAL   NO-UNDO.
   DEFINE VARIABLE iChannel       AS INTEGER   NO-UNDO.
-  DEFINE VARIABLE cRemoteVersion AS CHARACTER NO-UNDO.
   DEFINE VARIABLE cRemoteBuildNr AS CHARACTER NO-UNDO.
 
   /* Set debug flag */
@@ -12502,7 +12501,7 @@ PROCEDURE startSession :
     /* If you are using a build that is newer than the production version, 
      * you are in the beta program. Then automatically check for beta changes 
      */
-    RUN getVersionInfo.p(INPUT 'master', OUTPUT cRemoteVersion, OUTPUT cRemoteBuildNr).
+    RUN getVersionInfo.p(INPUT 'master', OUTPUT cRemoteBuildNr).
     IF '{build.i}' > cRemoteBuildNr THEN setRegistry("DataDigger:Update","UpdateChannel", "{&CHECK-BETA}").
 
     /* Check for new versions on GitHub */
@@ -12511,8 +12510,7 @@ PROCEDURE startSession :
     setRegistry('DataDigger:Update','LastUpdateCheck',ISO-DATE(TODAY)).
   END.
 
-  IF getRegistry('DataDigger:Update','RemoteBuildNr') > '{build.i}' 
-  OR getRegistry('DataDigger:Update','RemoteVersion') > '{version.i}' THEN
+  IF getRegistry('DataDigger:Update','RemoteBuildNr') > '{build.i}' THEN
   DO WITH FRAME frMain:
     fiFeedback:SCREEN-VALUE = '  New version available, click for info'.
     fiFeedback:TOOLTIP = 'click to open GitHub page'.
@@ -13346,4 +13344,4 @@ FUNCTION trimList RETURNS CHARACTER
 END FUNCTION. /* trimList */
 
 /* _UIB-CODE-BLOCK-END */
-&ANALYZE-RESUME
+&ANALYZE-RESUME