fix: move hash to function

Signed-off-by: Matt Williams <m@technovangelist.com>
technovangelist · Oct 26, 2023 · b9e0cc0 · b9e0cc0
1 parent a3e8c22
commit b9e0cc0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
   compile:
     strategy:
       matrix: 
-        target: [{target: x86_64-unknown-linux-gnu, file: linux/ollamamodelupdate}, {target: x86_64-pc-windows-msvc, file: windows/ollamamodelupdate.exe}, {target: x86_64-apple-darwin, file: macos-x86/ollamamodelupdate}, {target: aarch64-apple-darwin, file: macos-arm64/ollamamodelupdate}]
+        target: [{target: x86_64-unknown-linux-gnu, file: linux-ollamamodelupdate}, {target: x86_64-pc-windows-msvc, file: win-ollamamodelupdate.exe}, {target: x86_64-apple-darwin, file: macos-x86-ollamamodelupdate}, {target: aarch64-apple-darwin, file: macos-arm64-ollamamodelupdate}]
     runs-on: ubuntu-latest
     needs: changelog
     steps:
@@ -35,18 +35,7 @@ jobs:
 
       - run: 
           deno compile --allow-net --target ${{ matrix.target.target }} --output ${{ matrix.target.file}} update.ts
-
-      # - uses: "marvinpinto/action-automatic-releases@latest"
-      #   with:
-      #     repo_token: "${{ secrets.GITHUB_TOKEN }}"
-      #     automatic_release_tag: "latest"
-      #     prerelease: false
-      #     title: "Latest Build"
-      #     files: |
-      #       linux/ollamamodelupdate
-      #       windows/ollamamodelupdate.exe
-      #       macos-x86/ollamamodelupdate
-      #       macos-arm64/ollamamodelupdate
+
       - name: Release
         uses: softprops/action-gh-release@v1
         if: ${{ needs.changelog.outputs.skipped == 'false' }}
@@ -55,9 +44,9 @@ jobs:
           name: ${{ needs.changelog.outputs.tag }}
           body: ${{ needs.changelog.outputs.output }}
           files: |
-            linux/ollamamodelupdate
-            windows/ollamamodelupdate.exe
-            macos-x86/ollamamodelupdate
-            macos-arm64/ollamamodelupdate
+            linux-ollamamodelupdate
+            win-ollamamodelupdate.exe
+            macos-x86-ollamamodelupdate
+            macos-arm64-ollamamodelupdate
             
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/update.ts b/update.ts
@@ -16,12 +16,14 @@ for await (const model of localModels) {
       "Accept": "application/vnd.docker.distribution.manifest.v2+json"
     }
   })
+
   if (remoteModelInfo.status == 200) {
     const remoteModelInfoJSON = await remoteModelInfo.json()
-    const jsonstring = JSON.stringify(remoteModelInfoJSON).replace(/\s+/g, '')
-    const messageBuffer = new TextEncoder().encode(jsonstring);
-    const hashBuffer = await crypto.subtle.digest("SHA-256", messageBuffer);
-    const hash = encodeHex(hashBuffer);
+    // const jsonstring = JSON.stringify(remoteModelInfoJSON).replace(/\s+/g, '')
+    // const messageBuffer = new TextEncoder().encode(jsonstring);
+    // const hashBuffer = await crypto.subtle.digest("SHA-256", messageBuffer);
+    // const hash = encodeHex(hashBuffer);
+    const hash = await jsonhash(remoteModelInfoJSON);
     if (hash === localdigest) {
       console.log(`You have the latest ${model.name}`)
     } else {
@@ -38,10 +40,17 @@ for await (const model of localModels) {
         } catch (error) {
           console.log(error)
         }
-
       })
-
     }
   }
 
 }
+
+async function jsonhash(json: string) {
+  const jsonstring = JSON.stringify(json).replace(/\s+/g, '')
+  const messageBuffer = new TextEncoder().encode(jsonstring);
+  const hashBuffer = await crypto.subtle.digest("SHA-256", messageBuffer);
+  const hash = encodeHex(hashBuffer);
+
+  return hash
+}