Merge pull request #39 from srhinos/update-ci

Update CI Runner Versions

Author: srhinos

.github/workflows/ci.yml

@@ -1,16 +1,20 @@
 name: ci
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.11
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -19,10 +23,10 @@ jobs:
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names
-          flake8 primelooter.py --count --show-source --statistics
+          flake8 . --count --show-source --statistics
       - name: Lint with pylint
         run: |
-          pylint primelooter.py --fail-under 10 --disable=all --enable=classes --disable=W
+          pylint . --fail-under 10 --disable=all --enable=classes --disable=W
       - name: Lint with black
         run: |
-          black primelooter.py --check --line-length=119
+          black . --check --line-length=119

.github/workflows/manual-release.yml

@@ -7,23 +7,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile

.github/workflows/release.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup release please
-        uses: google-github-actions/release-please-action@v2
+        uses: google-github-actions/release-please-action@v3
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -23,23 +23,23 @@ jobs:
 
       - name: Set up QEMU
         if: ${{ steps.release.outputs.release_created }}
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         if: ${{ steps.release.outputs.release_created }}
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: ${{ steps.release.outputs.release_created }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
         if: ${{ steps.release.outputs.release_created }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile

experiment.py

@@ -13,15 +13,15 @@
     "operationName": "OffersContext_Offers_And_Items",
     "variables": {"pageSize": 999},
     "extensions": {},
-    "query": "query OffersContext_Offers_And_Items($dateOverride: Time, $pageSize: Int) {\n  inGameLoot: items(\n    collectionType: LOOT\n    dateOverride: $dateOverride\n    pageSize: $pageSize\n  ) {\n    items {\n      ...Item\n      __typename\n    }\n    __typename\n  }\n}\n\nfragment Item on Item {\n  id\n  isDirectEntitlement\n  requiresLinkBeforeClaim\n  grantsCode\n  isDeepLink\n  isFGWP\n  offers {\n    ...Item_Offer\n    __typename\n  }\n  game {\n    ...Game\n    __typename\n  }\n  __typename\n}\n\n\nfragment Item_Offer on Offer {\n  id\n  offerSelfConnection {\n    eligibility {\n      ...Item_Offer_Eligibility\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment Item_Offer_Eligibility on OfferEligibility {\n  isClaimed\n  canClaim\n  missingRequiredAccountLink\n}\n\nfragment Game on GameV2 {\n  id\n  assets {\n    title\n    publisher\n  }\n}\n",
+    "query": "query OffersContext_Offers_And_Items($dateOverride: Time, $pageSize: Int) {\n  inGameLoot: items(\n    collectionType: LOOT\n    dateOverride: $dateOverride\n    pageSize: $pageSize\n  ) {\n    items {\n      ...Item\n      __typename\n    }\n    __typename\n  }\n}\n\nfragment Item on Item {\n  id\n  isDirectEntitlement\n  requiresLinkBeforeClaim\n  grantsCode\n  isDeepLink\n  isFGWP\n  offers {\n    ...Item_Offer\n    __typename\n  }\n  game {\n    ...Game\n    __typename\n  }\n  __typename\n}\n\n\nfragment Item_Offer on Offer {\n  id\n  offerSelfConnection {\n    eligibility {\n      ...Item_Offer_Eligibility\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment Item_Offer_Eligibility on OfferEligibility {\n  isClaimed\n  canClaim\n  missingRequiredAccountLink\n}\n\nfragment Game on GameV2 {\n  id\n  assets {\n    title\n    publisher\n  }\n}\n",  # noqa: E501 TODO: This needs to become a non \n formatted string somewhere, just not doing it now
 }
 
 
 async def claim_offer(offer_id: str, item: dict, client: httpx.AsyncClient, headers: dict) -> True:
-    if item["offers"][0]["offerSelfConnection"]["eligibility"]["isClaimed"] != True:
+    if not item["offers"][0]["offerSelfConnection"]["eligibility"]["isClaimed"]:
         if (
-            item["offers"][0]["offerSelfConnection"]["eligibility"]["canClaim"] == False
-            and item["offers"][0]["offerSelfConnection"]["eligibility"]["missingRequiredAccountLink"] == True
+            item["offers"][0]["offerSelfConnection"]["eligibility"]["canClaim"] is False
+            and item["offers"][0]["offerSelfConnection"]["eligibility"]["missingRequiredAccountLink"] is True
         ):
             log.error(f"Cannot collect game `{item['game']['assets']['title']}`, account link required.")
             return
@@ -35,11 +35,11 @@ async def claim_offer(offer_id: str, item: dict, client: httpx.AsyncClient, head
                 }
             },
             "extensions": {},
-            "query": "fragment Place_Orders_Payload_Order_Information on OfferOrderInformation {\n  catalogOfferId\n  claimCode\n  entitledAccountId\n  entitledAccountName\n  id\n  orderDate\n  orderState\n  __typename\n}\n\nmutation placeOrdersDetailPage($input: PlaceOrdersInput!) {\n  placeOrders(input: $input) {\n    error {\n      code\n      __typename\n    }\n    orderInformation {\n      ...Place_Orders_Payload_Order_Information\n      __typename\n    }\n    __typename\n  }\n}\n",
+            "query": "fragment Place_Orders_Payload_Order_Information on OfferOrderInformation {\n  catalogOfferId\n  claimCode\n  entitledAccountId\n  entitledAccountName\n  id\n  orderDate\n  orderState\n  __typename\n}\n\nmutation placeOrdersDetailPage($input: PlaceOrdersInput!) {\n  placeOrders(input: $input) {\n    error {\n      code\n      __typename\n    }\n    orderInformation {\n      ...Place_Orders_Payload_Order_Information\n      __typename\n    }\n    __typename\n  }\n}\n",  # noqa: E501 TODO: This needs to become a non \n formatted string somewhere, just not doing it now
         }
 
         response = await client.post(gql_url, headers=headers, data=json.dumps(claim_payload))
-        if response.json()["data"]["placeOrders"]["error"] != None:
+        if response.json()["data"]["placeOrders"]["error"] is not None:
             log.error(f"Error: {response.json()['data']['placeOrders']['error']}")
 
 
@@ -64,6 +64,8 @@ async def primelooter(cookie_file):
         response = await client.post(gql_url, headers=json_headers, data=json.dumps(offers_payload))
         data = response.json()["data"]["inGameLoot"]["items"]
 
-        coros = await asyncio.gather(
+        # although insanely low, python WILL garbage collect running coroutines if their references
+        # aren't stored somewhere, therefore we noqa the Flake8 issue yelling at us about it.
+        coros = await asyncio.gather(  # noqa: F841
             *[claim_offer(item["offers"][0]["id"], item, client, json_headers) for item in data]
         )