Improve upload action

Author: ZwerOxotnik

.github/workflows/autoPublish.yml

@@ -35,13 +35,10 @@ jobs:
         prop_path: 'name'
     - name: Zip mod
       run: bash ./.scripts/zip_mod.sh
-    - uses: TGNThump/factorio-publish-mod-action@v1
-      with:
-        mod_portal_username: ${{ secrets.FACTORIO_USER }}
-        mod_portal_password: ${{ secrets.FACTORIO_PASSWORD }}
-        mod_name: ${{steps.mod_name.outputs.prop}}
-        asset_path: ./${{steps.mod_name.outputs.prop}}_${{steps.version.outputs.prop}}.zip
-        asset_name: ${{steps.mod_name.outputs.prop}}_${{steps.version.outputs.prop}}.zip
+    - name: Upload the mod on mods.factorio.com
+      env:
+        FACTORIO_MOD_API_KEY: ${{ secrets.FACTORIO_MOD_API_KEY }}
+      run: bash ./.scripts/upload.sh
     - uses: marvinpinto/action-automatic-releases@latest
       id: aar
       with:

.github/workflows/publish.yml

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 ### Run this script on GitHub after zipping the mod to upload the mod on mods.factorio.com
-### This a modified version of https://github.com/shanemadden/factorio-mod-portal-publish/blob/1930e44ecd86e3f2d90921da2a1f40b050fd12c3/entrypoint.sh
+### This a modified version of https://github.com/Penguin-Spy/factorio-mod-portal-publish/blob/5c669dc60672e6293afd5b1913a0c8475c5490c0/entrypoint.sh
+### You can generate your FACTORIO_MOD_API_KEY on https://factorio.com/create-api-key
 
 
 ### Check commands
@@ -27,50 +28,29 @@ if ! echo "${MOD_VERSION}" | grep -P --quiet '^(v)?\d+\.\d+\.\d+$'; then
 fi
 
 
-# Get a CSRF token by loading the login form
-CSRF=$(curl -b cookiejar.txt -c cookiejar.txt -s https://factorio.com/login?mods=1 | grep csrf_token | sed -r -e 's/.*value="(.*)".*/\1/')
-
-
-# Authenticate with the credential secrets and the CSRF token, getting a session cookie for the authorized user
-curl -b cookiejar.txt -c cookiejar.txt -s -e https://factorio.com/login?mods=1 -F "csrf_token=${CSRF}" -F "username_or_email=${FACTORIO_USER}" -F "password=${FACTORIO_PASSWORD}" -o /dev/null https://factorio.com/login
-
-
-# Query the mod info, verify the version number we're trying to push doesn't already exist
-curl -b cookiejar.txt -c cookiejar.txt -s "https://mods.factorio.com/api/mods/${MOD_NAME}/full" | jq -e ".releases[] | select(.version == \"${MOD_VERSION}\")"
-# store the return code before running anything else
-STATUS_CODE=$?
-
-if [[ $STATUS_CODE -ne 4 ]]; then
-    echo "Release already exists, skipping"
-    exit 0
-fi
-echo "Release doesn't exist for ${MOD_VERSION}, uploading"
-
-
-# Load the upload form, getting an upload token
-UPLOAD_TOKEN=$(curl -b cookiejar.txt -c cookiejar.txt -s "https://mods.factorio.com/mod/${MOD_NAME}/downloads/edit" | grep token | sed -r -e "s/.*token: '(.*)'.*/\1/")
-if [[ -z "${UPLOAD_TOKEN}" ]]; then
-    echo "Couldn't get an upload token, failed"
+# Get an upload url for the mod
+URL_RESULT=$(curl -s -d "mod=${MOD_NAME}" -H "Authorization: Bearer ${FACTORIO_MOD_API_KEY}" https://mods.factorio.com/api/v2/mods/releases/init_upload)
+UPLOAD_URL=$(echo "${URL_RESULT}" | jq -r '.upload_url')
+if [[ "${UPLOAD_URL}" == "null" ]] || [[ -z "${UPLOAD_URL}" ]]; then
+    echo "Couldn't get an upload url, failed"
+    ERROR=$(echo "${URL_RESULT}" | jq -r '.error')
+    MESSAGE=$(echo "${URL_RESULT}" | jq -r '.message // empty')
+    echo "${ERROR}: ${MESSAGE}"
     exit 1
 fi
 
-# Upload the file, getting back a response with details to send in the final form submission to complete the upload
-UPLOAD_RESULT=$(curl -b cookiejar.txt -c cookiejar.txt -s -F "file=@${MOD_NAME}_${MOD_VERSION}.zip;type=application/x-zip-compressed" "https://direct.mods-data.factorio.com/upload/mod/${UPLOAD_TOKEN}")
 
-# Parse 'em and stat the file for the form fields
-CHANGELOG=$(echo "${UPLOAD_RESULT}" | jq -r '@uri "\(.changelog)"')
-INFO=$(echo "${UPLOAD_RESULT}" | jq -r '@uri "\(.info)"')
-FILENAME=$(echo "${UPLOAD_RESULT}" | jq -r '.filename')
-THUMBNAIL=$(echo "${UPLOAD_RESULT}" | jq -r '.thumbnail // empty')
+# Upload the file
+UPLOAD_RESULT=$(curl -s -F "file=@${MOD_NAME}_${MOD_VERSION}.zip" "${UPLOAD_URL}")
 
-if [[ "${FILENAME}" == "null" ]] || [[ -z "${FILENAME}" ]]; then
+# The success attribute only appears on successful uploads
+SUCCESS=$(echo "${UPLOAD_RESULT}" | jq -r '.success')
+if [[ "${SUCCESS}" == "null" ]] || [[ -z "${SUCCESS}" ]]; then
     echo "Upload failed"
+    ERROR=$(echo "${UPLOAD_RESULT}" | jq -r '.error')
+    MESSAGE=$(echo "${UPLOAD_RESULT}" | jq -r '.message // empty')
+    echo "${ERROR}: ${MESSAGE}"
     exit 1
 fi
-echo "Uploaded ${MOD_NAME}_${MOD_VERSION}.zip to ${FILENAME}, submitting as new version"
-
-# Post the form, completing the release
-curl -b cookiejar.txt -c cookiejar.txt -s -X POST -d "file=&info_json=${INFO}&changelog=${CHANGELOG}&filename=${FILENAME}&file_size=${FILESIZE}&thumbnail=${THUMBNAIL}" -H "Content-Type: application/x-www-form-urlencoded" -o /dev/null "https://mods.factorio.com/mod/${MOD_NAME}/downloads/edit"
-# TODO if that had a failure exit code then report failure, exit 1
 
-echo "Completed"
+echo "Upload of ${MOD_NAME}_${MOD_VERSION}.zip completed"