v3.2.8.0 (07 December, 2019)

* Change: Fix regex for "default_branch" name
Matze1985 · Dec 7, 2019 · 09e0108 · 09e0108
1 parent efb0eb8
commit 09e0108
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/GlucoTT.au3 b/GlucoTT.au3
@@ -2,7 +2,7 @@
    #AutoIt3Wrapper_Icon=Icon.ico
    #AutoIt3Wrapper_UseX64=n
    #AutoIt3Wrapper_Res_Description=GlucoTT
-   #AutoIt3Wrapper_Res_Fileversion=3.2.5.0
+   #AutoIt3Wrapper_Res_Fileversion=3.2.8.0
    #AutoIt3Wrapper_Res_LegalCopyright=Mathias Noack
    #AutoIt3Wrapper_Res_Language=1031
    #AutoIt3Wrapper_Run_Tidy=y
@@ -566,14 +566,18 @@ Func _CgmUpdateCheck()
    Local $hConnectCgmToRepo = _WinHttpConnect($hOpen, $sGithubApiUrl)
    $hRequestCgmToRepo = _WinHttpSimpleSendSSLRequest($hConnectCgmToRepo, Default, "/repos/" & $sInputGithubAccount & "/cgm-remote-monitor")
    Local $sReturnedCgmToRepo = _WinHttpSimpleReadData($hRequestCgmToRepo)
-   Local $sGithubDefaultBranch = _ArrayToString(StringRegExp($sReturnedCgmToRepo, 'default_branch":"(.*?)","parent"', 1))
+   _DebugReportVar("$sReturnedCgmToRepo", $sReturnedCgmToRepo)
+   Local $sGithubDefaultBranch = StringRegExpReplace(_ArrayToString(StringRegExp($sReturnedCgmToRepo, '"default_branch":(.*?),', 1)), ' |"', "") ; default branch
    _DebugReportVar("$sGithubDefaultBranch", $sGithubDefaultBranch)
    _WinHttpCloseHandle($hConnectCgmToRepo)
 
    ; Check update for branch
+   ; Example: https://github.com/<User>/cgm-remote-monitor/compare/dev...nightscout:dev
+   ; Example: https://api.github.com/repos/<User>/cgm-remote-monitor/compare/dev...nightscout:dev
    Local $hConnectCgmUpdateCompare = _WinHttpConnect($hOpen, $sGithubApiUrl)
    Local $hRequestCgmUpdateCompare = _WinHttpSimpleSendSSLRequest($hConnectCgmUpdateCompare, Default, "/repos/" & $sInputGithubAccount & "/cgm-remote-monitor/compare/" & $sGithubDefaultBranch & "...nightscout:" & $sGithubDefaultBranch)
    Local $sReturnedCgmUpdateCompare = _WinHttpSimpleReadData($hRequestCgmUpdateCompare)
+   _DebugReportVar("$sReturnedCgmUpdateCompare", $sReturnedCgmUpdateCompare)
    _WinHttpCloseHandle($hConnectCgmUpdateCompare)
 
    ; Check valid GitHub-User with repository

diff --git a/GlucoTT.exe b/GlucoTT.exe
diff --git a/Update/ChangeLog.txt b/Update/ChangeLog.txt
@@ -1,6 +1,9 @@
 ChangeLog
 
 Summarized history of the changes:
+v3.2.8.0 (07 December, 2019)
+	Change: Fix regex for "default_branch" name
+
 v3.2.5.0 (14 November, 2019)
 	Change: Fix update bug for hard coded "dev" entry
 

diff --git a/Update/CheckUpdate.txt b/Update/CheckUpdate.txt
@@ -1,7 +1,7 @@
 [GlucoTT.exe]
-version=3.2.5.0
-date=2019/11/14 16:32
+version=3.2.8.0
+date=2019/12/07 12:27
 Filesize=1177600
-CRC=366F3BCF
+CRC=6C2145C8
 download=https://github.com/Matze1985/GlucoTT/raw/master/GlucoTT.exe
 changes=https://raw.githubusercontent.com/Matze1985/GlucoTT/master/Update/ChangeLog.txt