github action to automate some of the item updating process

Author: Torwent

.github/workflows/hash-files.yml

@@ -1,16 +1,16 @@
 name: Create Hashes
 
 on:
-  push:
-    branches:
-      - main
+  workflow_run:
+    workflows: ["Update Items"]
+    types:
+      - completed
 
 jobs:
   hash-files:
     runs-on: windows-latest
     steps:
       - name: Fetch Simba 2 download URL
-        id: simba-url
         run: |
           $url = "https://raw.githubusercontent.com/Villavu/Simba-Build-Archive/refs/heads/main/latest.win64"
           $response = Invoke-WebRequest -Uri $url -UseBasicParsing

.github/workflows/update-items.yml

@@ -0,0 +1,73 @@
+name: Update Items
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  hash-files:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+        with:
+          path: ./wasp-data
+          
+      - name: Check if file changed in previous commit
+        id: file_check
+        shell: bash
+        working-directory: ./wasp-data
+        run: |
+          if git diff --name-only HEAD^ HEAD | grep -q '^finders/items/data/item.txt$'; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "changed=false" >> $GITHUB_OUTPUT
+          fi
+          
+      - name: Fetch Simba 2 download URL
+        if: steps.file_check.outputs.changed == 'true'
+        shell: powershell
+        run: |
+          $url = "https://raw.githubusercontent.com/Villavu/Simba-Build-Archive/refs/heads/main/latest.win64"
+          $response = Invoke-WebRequest -Uri $url -UseBasicParsing
+          $baseUrl = $response.Content.Trim() -replace 'Win64\.zip\?raw=true$', ''
+          Write-Output "Base URL: $baseUrl"
+          echo "::set-output name=baseUrl::$baseUrl"
+          New-Item -Path ".\Includes" -ItemType Directory
+
+      - name: Download Simba 2.0 (64-bit)
+        if: steps.file_check.outputs.changed == 'true'
+        shell: powershell
+        run: |
+          $baseUrl = "${{ steps.simba-url.outputs.baseUrl }}"
+          $downloadUrl = "$baseUrl" + "Win64.zip?raw=true"
+          Write-Output "Download URL (64-bit): $downloadUrl"
+          $outputFile = ".\download.zip"
+          Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile
+          Expand-Archive -Path $outputFile -DestinationPath . -Force
+          Remove-Item -Path $outputFile -Force
+          
+      - name: Hash all eligible files
+        if: steps.file_check.outputs.changed == 'true'
+        shell: bash
+        run: |
+          ls -a
+          ./Simba-Win64.exe --extractopenssl --run ./wasp-data/tools/update_items.simba
+          ./Simba-Win64.exe --extractopenssl --run ./wasp-data/tools/update_gear.simba
+
+      - name: Commit hash files
+        shell: bash
+        run: |
+          cd ./wasp-data
+          git config --global user.name "Wasp Bot"
+          git config --global user.email "[email protected]"
+          if [[ -n "$(git status --porcelain finders/items/data/hash.txt finders/items/masks.zip jsons/gear.json)" ]]; then
+            git add finders/items/data/hash.txt finders/items/masks.zip jsons/gear.json
+            CURRENT_DATE=$(date +'%Y.%m.%d')
+            COMMIT_HASH=$(git rev-parse --short HEAD)
+            git commit -m "Automatic version bump to $CURRENT_DATE-$COMMIT_HASH"
+            git push
+          else
+            echo "No relevant file changes to commit."
+          fi

tools/update_gear.simba

@@ -1,10 +1,13 @@
-{$I WaspLib/osrs.simba}
-
 const
   ENDPOINT = 'https://oldschool.runescape.wiki/api.php?';
-  SILENT: Boolean = False;
+  SILENT: Boolean = True;
   TEST_ITEM: String = '';
 
+  SLOT_NAMES: TStringArray = [
+    'head', 'cape', 'neck', 'ammo', 'weapon', 'body', 'shield', 'legs', 'hands',
+    'feet', 'ring', 'spec_weapons', '2h'
+  ];
+
 function GetEndPoint(name: String): String;
 begin
   Result := ENDPOINT + 'action=parse&page=' +
@@ -32,11 +35,9 @@ function TSlotArray.GetStr(): String;
 var
   i: Integer;
 begin
-  for i := 0 to 10 do
-    Result += '  "' + ToStr(ERSEquipment(i)).After('ERSEquipment.').ToLower() + '": ' + Self[i].Unique().Sorted().GetStr() + ',' + LINE_SEP;
-
-  Result += '  "spec_weapons": ' + Self[11].Unique().Sorted().GetStr() + ',' + LINE_SEP;
-  Result += '  "2h": ' + Self[12].Unique().Sorted().GetStr();
+  for i := 0 to 11 do
+    Result += '  "' + SLOT_NAMES[i] + '": ' + Self[i].Unique().Sorted().GetStr() + ',' + LINE_SEP;
+  Result += '  "' + SLOT_NAMES[12] + '": ' + Self[12].Unique().Sorted().GetStr();
 end;
 
 procedure FillSlot(item, txt: String);
@@ -48,7 +49,7 @@ begin
 
   if txt.Contains('slot = weapon') then
   begin
-    Slots[ERSEquipment.WEAPON] += item;
+    Slots[4] += item;
     if txt.Contains('Category:Weapons with Special attacks') then
       Slots[11] += item;
     Exit;
@@ -64,60 +65,60 @@ begin
 
   if txt.Contains('slot = head') then
   begin
-    Slots[ERSEquipment.HEAD] += item;
+    Slots[0] += item;
     Exit;
   end;
 
   if txt.Contains('slot = cape') then
   begin
-    Slots[ERSEquipment.CAPE] += item;
+    Slots[1] += item;
     Exit;
   end;
 
   if txt.Contains('slot = neck') then
   begin
-    Slots[ERSEquipment.NECK] += item;
+    Slots[2] += item;
     Exit;
   end;
 
   if txt.Contains('slot = ammo') then
   begin
-    Slots[ERSEquipment.AMMO] += item;
+    Slots[3] += item;
     Exit;
   end;
 
   if txt.Contains('slot = body') then
   begin
-    Slots[ERSEquipment.BODY] += item;
+    Slots[5] += item;
     Exit;
   end;
 
   if txt.Contains('slot = shield') then
   begin
-    Slots[ERSEquipment.SHIELD] += item;
+    Slots[6] += item;
     Exit;
   end;
 
   if txt.Contains('slot = legs') then
   begin
-    Slots[ERSEquipment.LEGS] += item;
+    Slots[7] += item;
     Exit;
   end;
 
   if txt.Contains('slot = hands') then
   begin
-    Slots[ERSEquipment.HANDS] += item;
+    Slots[8] += item;
     Exit;
   end;
 
   if txt.Contains('slot = feet') then
   begin
-    Slots[ERSEquipment.FEET] += item;
+    Slots[9] += item;
     Exit;
   end;
 
   if txt.Contains('slot = ring') then
-    Slots[ERSEquipment.RING] += item;
+    Slots[10] += item;
 end;
 
 procedure TStringArray.Filter();
@@ -148,17 +149,16 @@ begin
   end;
 end;
 
-
 var
   items: TStringArray;
   i: Integer;
   url: String;
-  json, tmp: TJSONItem;
+  json, tmp: TJSONParser;
   text: String;
 begin
   ClearSimbaOutput();
 
-  items := FileReadLines(ItemFinder.Database.DataDir + 'item').Unique();
+  items := FileReadLines({$MACRO DIR} + '..' + PATH_SEP + 'finders' + PATH_SEP + 'items' + PATH_SEP + 'data' + PATH_SEP + 'item.txt').Unique();
   items.Filter();
 
   for i := 0 to High(items) do
@@ -176,13 +176,14 @@ begin
       WriteLn url;
 
     try
-      json := HTTPClient.GetJson(url);
+      json := new TJSONParser();
+      json.Parse(HTTPClient.Get(url));
     except
       WriteLn('Failed to fetch: ', items[i]);
     end;
 
     if TEST_ITEM <> '' then
-      WriteLn json.ToJSON();
+      WriteLn json.Format();
 
     if json = nil then
     begin
@@ -194,28 +195,25 @@ begin
       tmp := json.Item['parse'];
     except
       WriteLn('Failed to find parse: ', items[i]);
-      json.Free();
       Continue;
     end;
 
     try
-      text := tmp.Item['wikitext'].ToJSON();
+      text := tmp.Item['wikitext'].Format([EJSONFormatOption.SINGLE_LINE_ARR]);
     except
       if not SILENT then
         WriteLn('Failed to find wikitext: ', items[i]);
-      json.Free();
       Continue;
     end;
 
     if TEST_ITEM <> '' then
       FillSlot(TEST_ITEM, text)
     else
       FillSlot(items[i], text);
-    json.Free();
   end;
 
   text := '{' + LINE_SEP + Slots.GetStr() + LINE_SEP + '}';
   WriteLn text;
   if TEST_ITEM = '' then
-    FileWrite(GearData.PATH, text);
+    FileWrite({$MACRO DIR} + '..' + PATH_SEP + 'jsons' + PATH_SEP + 'gear.json', text);
 end;