fix: add support for reading Windows versions in metrics command

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest, macos-13]
+        os: [windows-latest, ubuntu-latest, macos-latest, macos-15-intel]
 
     steps:
       - name: Checkout Repository
@@ -33,12 +33,12 @@ jobs:
           nimble update
 
       - name: Build Takajo binary
-        if: matrix.os != 'macos-13'
+        if: matrix.os != 'macos-15-intel'
         run: |
           nimble build -d:release --threads:on
 
       - name: Build Takajo binary for Intel Mac
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         run: |
           nimble build -d:release --threads:on --os:macosx --cpu:amd64 
 
@@ -69,7 +69,7 @@ jobs:
                 mv release-binaries/takajo release-binaries/takajo-${{ github.event.inputs.release_ver }}-lin-x64-gnu ;;
             'macos-latest')
                 mv release-binaries/takajo release-binaries/takajo-${{ github.event.inputs.release_ver }}-mac-aarch64 ;;
-            'macos-13')
+            'macos-15-intel')
                 mv release-binaries/takajo release-binaries/takajo-${{ github.event.inputs.release_ver }}-mac-x64 ;;
           esac
 
@@ -84,7 +84,7 @@ jobs:
               echo "artifact_name=takajo-${{ github.event.inputs.release_ver }}-lin-x64-gnu" >> $GITHUB_OUTPUT ;;
             'macos-latest')
               echo "artifact_name=takajo-${{ github.event.inputs.release_ver }}-mac-aarch64" >> $GITHUB_OUTPUT ;;
-            'macos-13')
+            'macos-15-intel')
               echo "artifact_name=takajo-${{ github.event.inputs.release_ver }}-mac-x64" >> $GITHUB_OUTPUT ;;
           esac
 

CHANGELOG-Japanese.md

@@ -11,6 +11,7 @@
 - `automagic`コマンドのパースバグを修正した。 (#278) (@fukusuket)
 - HTMLレポートおよびサーバコマンドのJSON解析における`RecordID`の欠落を処理できるようにした。 (#279) (@fukusuket)
 - `html-server`の日付は、ローカル時間に変更されていた。 (#281) (@fukusuket)
+- `automagic`によるコンピューターメトリクスの出力にはOS情報が含まれていなかった。 (#286) (@fukusuket)
 - タイムラインCSVファイルのヘッダーに余分なコンマが含まれており、読み込み時に問題を引き起こしていた。(#282) (@fukusuket)
 - `html-server`コマンドの壊れたリンクを修正した。 (#280) (@fukusuket)
 

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fixed a parsing bug in the `automagic` command. (#278) (@fukusuket)
 - Handle missing `RecordID` in JSON parsing for HTML report and server commands. (#279) (@fukusuket)
 - Dates in the `html-server` was being converted to local time. (#281) (@fukusuket)
+- OS information was not included in the computer metrics output with `automagic`. (#286) (@fukusuket)
 - Timeline CSV files had an extra comma in the header which was causing problems when loading. (#282) (@fukusuket)
 - Fixed broken links in the `html-server` command. (#280) (@fukusuket)
 

src/takajopkg/automagic.nim

@@ -41,10 +41,11 @@ proc autoMagic(level: string = "informational", skipProgressBar: bool = false,
     displayTable: displayTable, timeline: timeline, output: output & "/ListIP-Addresses.txt")
 
   # metrics-computers -t ../hayabusa/timeline.jsonl -o case-1/MetricsComputers.csv
+  let windowsVersions = readWindowsVersions("conf/windows_versions.csv")
   let cmd0 = metricsComputersCmd(name: "metrics-computers",
     skipProgressBar: skipProgressBar,
     displayTable: displayTable,
-    timeline: timeline, output: output & "/MetricsComputers.csv")
+    timeline: timeline, output: output & "/MetricsComputers.csv", windowsVersions: windowsVersions)
 
   # metrics-users -t ../hayabusa/timeline.jsonl -o case-1/MetricsUsers.csv
   let cmd01 = metricsUsersCmd(name: "metrics-users",