Merge branch 'rime:master' into a9m

alpzmj9 · web-flow · commit 15bfd9ec6ab9 · 2025-02-23T00:48:22.000+08:00
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -91,7 +91,7 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
-          .\get-rime.ps1 -tag 1.13.0 -use dev
+          .\get-rime.ps1 -use dev
 
       - name: Build data
         shell: pwsh
@@ -171,7 +171,7 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
-          .\get-rime.ps1 -tag 1.13.0 -use dev
+          .\get-rime.ps1 -use dev
 
 
       - name: Build data
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -58,7 +58,7 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
-          .\get-rime.ps1 -tag 1.13.0 -use dev
+          .\get-rime.ps1 -use dev
 
       - name: Build data
         run: |
@@ -112,9 +112,3 @@ jobs:
             ./output/archives/weasel*.exe
             ./output/archives/debug_symbols.7z
           body_path: ${{ github.workspace }}/RELEASE_CHANGELOG.md
-        
-      - name: Update testing Appcast
-        if: ${{ github.repository == 'rime/weasel' }}
-        run: gh workflow run gh-pages.yml -R rime/home --ref master
-        env:
-          GH_TOKEN: ${{ secrets.ACTIONS_DEPLOY_KEY }}
diff --git a/.github/workflows/update-appcast.yml b/.github/workflows/update-appcast.yml
@@ -0,0 +1,16 @@
+name: Update Appcast
+on:
+  release:
+    types: [published, prereleased]
+jobs:
+
+  update_appcast:
+
+    runs-on: windows-2019
+
+    steps:
+      - name: Update Appcast
+        if: ${{ github.repository == 'rime/weasel' }}
+        run: gh workflow run gh-pages.yml -R rime/home --ref master
+        env:
+          GH_TOKEN: ${{ secrets.ACTIONS_DEPLOY_KEY }}
diff --git a/WeaselTSF/Compartment.cpp b/WeaselTSF/Compartment.cpp
@@ -253,8 +253,7 @@ HRESULT WeaselTSF::_HandleCompartment(REFGUID guidCompartment) {
       _EnableLanguageBar(isOpen);
       _UpdateLanguageBar(_status);
     } else {
-      _status.ascii_mode = !_status.ascii_mode;
-      _SetKeyboardOpen(true);
+      _status.ascii_mode = !_IsKeyboardOpen();
       if (_pLangBarButton && _pLangBarButton->IsLangBarDisabled())
         _EnableLanguageBar(true);
       _HandleLangBarMenuSelect(_status.ascii_mode
diff --git a/WeaselTSF/LanguageBar.cpp b/WeaselTSF/LanguageBar.cpp
@@ -416,7 +416,11 @@ void WeaselTSF::_UpdateLanguageBar(weasel::Status stat) {
   else
     flags &= (~TF_CONVERSIONMODE_FULLSHAPE);
   _SetCompartmentDWORD(flags, GUID_COMPARTMENT_KEYBOARD_INPUTMODE_CONVERSION);
-
+  if (!_isToOpenClose) {
+    BOOL open = !stat.ascii_mode;
+    if (_IsKeyboardOpen() != open)
+      _SetKeyboardOpen(open);
+  }
   _pLangBarButton->UpdateWeaselStatus(stat);
 }
 
diff --git a/clang-format.ps1 b/clang-format.ps1
@@ -21,7 +21,7 @@ $filesToProcess = @()
 
 $WEASEL_SOURCE_PATH | ForEach-Object {
   $filesToProcess += Get-ChildItem -Path $_ -Recurse -Include *.cpp, *.h |
-  Where-Object { $_.FullName -notmatch "include\\wtl\\" -and -not (ShouldExclude $_.FullName) } |
+  Where-Object { $_.FullName -notmatch "include[\\/]wtl[\\/]" -and -not (ShouldExclude $_.FullName) } |
   ForEach-Object { $_.FullName }
 }
 
diff --git a/get-rime.ps1 b/get-rime.ps1
@@ -144,8 +144,20 @@ try {
 } catch {
   $cmdOk = $false
   if($extract) {
-    Write-Host "❌ Error: 7z is not available. Maybe 7z is not in PATH or not installed"
-    SafeExit
+    Write-Host "❌ Error: 7z is not available. Maybe 7z is not in PATH or not installed";
+    $original_7z_url = "https://github.com/ip7z/7zip/releases/download/24.08/7zr.exe";
+    if ($url_pat -and $url_replace) {
+      $original_7z_url = $original_7z_url -replace $url_pat, $url_replace;
+    }
+    try {
+      Write-Host "We will download 7z console tool from: $original_7z_url";
+      Invoke-WebRequest -Uri $original_7z_url -OutFile ".\7z.exe";
+      $env:Path += ";$PWD";
+      $cmdOk = $true
+    } catch{
+      Write-Host "Error download 7z commandline tool";
+      SafeExit
+    }
   }
 }
 # check 64 bit
diff --git a/github.install.bat b/github.install.bat
diff --git a/librime b/librime
@@ -1 +1 @@
-Subproject commit e8184dceaf9a89a21d6dc25c1850779cd652c472
+Subproject commit 1c23358157934bd6e6d6981f0c0164f05393b497
diff --git a/update/bump-version.ps1 b/update/bump-version.ps1
@@ -1,8 +1,19 @@
-param( [string]$tag, [switch]$updatelog)
-# -tag [new_tag], new tag shall be in format ^\d+\.\d+\.\d+$ and greater than
-# the current one
-# -updatelog update CHANGELOG.md if this switch used
-
+#!/usr/bin/env pwsh
+param( [string]$tag, [string]$basetag, [switch]$updatelog, [switch]$h)
+# -tag [new_tag], new tag shall be in format of ^\d+\.\d+\.\d+$ and greater than
+#     the current one or $basetag
+# -basetag [basetag name], specify the base tag(which shall be in format of ^\d+\.\d+\.\d+$),
+#     default to be the latest number format tag name
+# -updatelog, update CHANGELOG.md if this switch used
+# -h, show help info
+function faild_exit {
+  Write-Host 
+  Write-Host "Orz :( bump version failed!"
+  Write-Host "we will revert the modification by command git checkout . "
+  Write-Host 
+  & git checkout .
+  exit 1
+}
 # get old version info from file, esp from build.bat
 function get_old_version{
   param ([string]$filePath)
@@ -25,7 +36,6 @@ function get_old_version{
   $version['str'] = $version["major"] + "." + $version["minor"] + "." + $version["patch"];
   return $version;
 }
-
 # parse new version info
 function parse_new_version {
   param([string]$new_version)
@@ -37,26 +47,10 @@ function parse_new_version {
   }
   return $version;
 }
-
-# update bat file with param filePath, and tags 
-function update_bat_file{
-  param( [string]$filePath, $old_version, $new_version)
-  $old_major, $old_minor, $old_patch = $old_version['major'], $old_version["minor"], $old_version["patch"];
-  $new_major, $new_minor, $new_patch = $new_version['major'], $new_version["minor"], $new_version["patch"];
-  $fileContent = Get-Content -Path $filePath;
-  $fileContent = $fileContent -replace "VERSION_MAJOR=$old_major", "VERSION_MAJOR=$new_major";
-  $fileContent = $fileContent -replace "VERSION_MINOR=$old_minor", "VERSION_MINOR=$new_minor";
-  $fileContent = $fileContent -replace "VERSION_PATCH=$old_patch", "VERSION_PATCH=$new_patch";
-  Set-Content -Path $filePath -Value $fileContent -Encoding UTF8;
-}
-
 # update change log, work like clog-cli
 function update_changelog {
   param( [string]$new_tag, [string]$old_tag)
-  # get the current the previous release tag and current release tag
-  $tags = git tag --sort=creatordate | Select-String -Pattern '^\d+\.\d+\.\d+$' | ForEach-Object { $_.ToString() };
-  $latestTag = $tags[-1];
-  $commits = git log "$latestTag..HEAD" --pretty=format:"%s ([%an](https://github.com/rime/weasel/commit/%H))";
+  $commits = git log "$old_tag..HEAD" --pretty=format:"%s ([%an](https://github.com/rime/weasel/commit/%H))";
   # group commit logs
   $groupedCommits = @{
     build = @(); ci = @(); fix = @(); feat = @(); docs = @(); style = @();
@@ -75,8 +69,8 @@ function update_changelog {
     commit = "Commits";
   };
   foreach ($commit in $commits) {
-    if ($commit -match "^(build|ci|fix|feat|docs|style|refactor|test|chore):") {
-      $prefix = $matches[1];
+    if ($commit -match "^((?i)(build|ci|fix|feat|docs|style|refactor|test|chore)(\([^\)]+\))?):") {
+      $prefix = $matches[2].ToLower();
       $groupedCommits[$prefix] += $commit;
     } else {
       $groupedCommits["commit"] += $commit;
@@ -99,57 +93,102 @@ function update_changelog {
   $contentAdd += $changelog;
   Write-Host "`n" + $contentAdd + "`n"
   $fileContent = $contentAdd + "`n" + $fileContent;
-  $fileContent | Out-File -FilePath "CHANGELOG.md" -Encoding UTF8;
+  $fileContent | Out-File -FilePath "CHANGELOG.md" -NoNewline -Encoding UTF8;
 }
-
-# update appcast file, with regex patterns
-function update_appcast_file {
+# replace string with regex pat
+function replace_str {
   param( [string]$filePath, [string]$pat_orig, [string]$pat_replace)
-  $fileContent = Get-Content -Path $filePath;
-  $fileContent = $fileContent -replace $pat_orig, $pat_replace;
-  Set-Content -Path $filePath -Value $fileContent;
+  $fileContent = Get-Content -Path $filePath -Raw;
+  $fileContent = [regex]::Replace($fileContent, $pat_orig, $pat_replace)
+  $fileContent | Out-File -FilePath $filePath -NoNewline;
+}
+# update xml file
+function update_xml {
+  param([string]$filePath, [string]$tag)
+  $CurrentCulture = [System.Globalization.CultureInfo]::InvariantCulture
+  $localTime = Get-Date
+  $currentDateTime = $localTime.ToString("ddd, dd MMM yyyy HH:mm:ss zz00")
+  replace_str -filePath "$filePath" -pat_orig "\d+\.\d+\.\d+" -pat_replace $tag
+  replace_str -filePath "$filePath" `
+    -pat_orig "(?<=<sparkle:releaseNotesLink>)[^>]*(?=</sparkle:releaseNotesLink>)" `
+    -pat_replace "http://rime.github.io/release/weasel/"
+  replace_str -filePath "$filePath" `
+    -pat_orig "(?<=<pubDate>).*?(?=</pubDate>)" -pat_replace "$currentDateTime"
+  Write-Host "$filePath updated"
+}
+# update bat file
+function update_bat {
+  param([string]$filePath, [string]$tag)
+  $new_version = parse_new_version -new_version $tag
+  replace_str -filePath $filePath -pat_orig "(?<=VERSION_MAJOR=)\d+" $new_version['major']
+  replace_str -filePath $filePath -pat_orig "(?<=VERSION_MINOR=)\d+" $new_version['minor']
+  replace_str -filePath $filePath -pat_orig "(?<=VERSION_PATCH=)\d+" $new_version['patch']
+  Write-Host "$filePath updated"
+}
+# test if cwd is weasel root
+function is_weasel_root() {
+  return (Test-Path -Path "weasel.sln") -and (Test-Path -Path ".git")
 }
 ###############################################################################
 # program now started
+if ($h -or (-not $tag)) {
+  $info = @(
+ "-tag [new_tag]`n`tnew tag shall be in format of ^\d+\.\d+\.\d+$ and greater than the current one or `$basetag",
+ "-basetag [basetag name]`n`tspecify the base tag(which shall be in format of ^\d+\.\d+\.\d+$), default to be the latest number format tag name",
+ "-updatelog`n`tupdate CHANGELOG.md if this switch used",
+ "-h`n`tshow help info"
+ )
+ Write-Host ($info -join "`n");
+ exit 0;
+}
+if (-not (is_weasel_root)) {
+  Write-Host "Current directory is: $(Get-Location), it's not the weasel root directory"
+  Write-Host "please run ``update/bump_version.ps1`` with parameters under the weasel root in Powershell";
+  Write-Host "or run ``pwsh update/bump_version.ps1`` with parameters under weasel root in shell if yor're running Mac OS or Linux"
+  exit 1;
+}
 # tag name not match rule, exit
 if (-not ($tag -match '^\d+\.\d+\.\d+$')) {
   Write-Host "tag name not match rule '^\d+\.\d+\.\d+$'";
   Write-Host "please recheck it";
-  exit;
+  exit 1;
 }
 # get old version
 $old_version = get_old_version -filePath "build.bat";
-$old_major, $old_minor, $old_patch = $old_version['major'], $old_version["minor"], $old_version["patch"];
 # get new version
 $new_version = parse_new_version -new_version $tag
+if ($basetag -eq "") {
+  $basetag = $old_version["str"]
+}
+if ($basetag -notmatch "^\d+\.\d+\.\d+$") {
+  Write-Host "basetag format is not correct, it shall be in format of '^\d+\.\d+\.\d+$'"
+  Write-Host "please recheck it";
+  exit 1;
+}
+
 # check new version is greater than the current one
 if ($tag -eq $old_version["str"]) {
   Write-Host "the new tag: $tag is the same with the old one:" $old_version["str"];
-  exit;
+  exit 1;
 } elseif ($tag -lt $old_version["str"]) {
   Write-Host "$tag is older version than " $old_version['str']", please recheck your target version.";
-  exit;
+  exit 1;
 }
-Write-Host "bump version to $tag ... "
-#get date-time string in english date-time format
-$CurrentCulture = [System.Globalization.CultureInfo]::InvariantCulture
-$currentDateTime = (Get-Date).ToString("ddd, dd MMM yyyy HH:mm:ss K", $CurrentCulture)
-
-#update appcast files
-update_appcast_file -filePath "update/appcast.xml" -pat_orig "$old_major\.$old_minor\.$old_patch" -pat_replace $tag
-update_appcast_file -filePath "update/appcast.xml" -pat_orig "<pubDate>.*?</pubDate>" -pat_replace "<pubDate>$currentDateTime</pubDate>"
-Write-Host "update/appcast.xml updated"
-update_appcast_file -filePath "update/testing-appcast.xml" -pat_orig "$old_major\.$old_minor\.$old_patch" -pat_replace $tag
-update_appcast_file -filePath "update/testing-appcast.xml" -pat_orig "<pubDate>.*?</pubDate>" -pat_replace "<pubDate>$currentDateTime</pubDate>"
-Write-Host "update/testing-appcast.xml updated"
-#update bat files
-update_bat_file -filePath "build.bat" -old_version $old_version -new_version $new_version
-Write-Host "build.bat updated"
-update_bat_file -filePath "xbuild.bat" -old_version $old_version -new_version $new_version
-Write-Host "xbuild.bat updated"
+Write-Host "Bumping version from $($old_version['str']) to $tag ..."
+# update xml files
+update_xml -filePath "update/appcast.xml" -tag "$tag";
+if ($?) { } else { faild_exit }
+update_xml -filePath "update/testing-appcast.xml" -tag "$tag";
+if ($?) { } else { faild_exit }
+# update bat files
+update_bat -filePath "build.bat" -tag "$tag";
+if ($?) { } else { faild_exit }
+update_bat -filePath "xbuild.bat" -tag "$tag";
+if ($?) { } else { faild_exit }
 #update CHANGELOG.md
 if ($updatelog) {
-  update_changelog -new_tag $tag -old_tag "$old_major.$old_minor.$old_patch"
+  update_changelog -new_tag $tag -old_tag $basetag;
+  if ($?) { } else { faild_exit }
   & git add CHANGELOG.md
   Write-Host "CHANGELOG.md updated"
 }
diff --git a/update/bump-version.sh b/update/bump-version.sh

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ $filesToProcess = @()`
`21`	`21`
`22`	`22`	`$WEASEL_SOURCE_PATH \| ForEach-Object {`
`23`	`23`	`$filesToProcess += Get-ChildItem -Path $_ -Recurse -Include .cpp, .h \|`
`24`		`- Where-Object { $_.FullName -notmatch "include\\wtl\\" -and -not (ShouldExclude $_.FullName) } \|`
	`24`	`+ Where-Object { $_.FullName -notmatch "include[\\/]wtl[\\/]" -and -not (ShouldExclude $_.FullName) } \|`
`25`	`25`	`ForEach-Object { $_.FullName }`
`26`	`26`	`}`
`27`	`27`