release: v1.36.0

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
   workflow_dispatch: ~
 
 jobs:
@@ -12,51 +12,46 @@ jobs:
       commit: ${{ steps.validate.outputs.commit }}
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: validate
-      id: validate
-      env:
-        GITHUB_CONTEXT: ${{ toJSON(github) }}
-      run: |
-        python3 ./scripts/validate_commit.py
+      - name: validate
+        id: validate
+        env:
+          GITHUB_CONTEXT: ${{ toJSON(github) }}
+        run: |
+          python3 ./scripts/validate_commit.py
 
   build:
     runs-on: ubuntu-latest
     needs: validate
-    strategy:
-      matrix:
-        python-version: [2.7, 3.7]
-      max-parallel: 2
-
     steps:
-    - uses: actions/checkout@v2
-      if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
-
-    - name: setup-python-v${{ matrix.python-version }}
-      if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: install
-      if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install -r requirements.txt
-
-    - name: lint
-      if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
-      run: |
-        flake8
-
-    - name: test
-      if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
-      env:
-        A4KSTREAMING_IMDB_TOKEN: ${{ secrets.A4KSTREAMING_IMDB_TOKEN }}
-        A4KSTREAMING_PREMIUMIZE_APIKEY: ${{ secrets.A4KSTREAMING_PREMIUMIZE_APIKEY }}
-        A4KSTREAMING_REALDEBRID_APIKEY: ${{ secrets.A4KSTREAMING_REALDEBRID_APIKEY }}
-        A4KSTREAMING_ALLDEBRID_APIKEY: ${{ secrets.A4KSTREAMING_ALLDEBRID_APIKEY }}
-        A4KSTREAMING_PROVIDER_URL: ${{ secrets.A4KSTREAMING_PROVIDER_URL }}
-      run: |
-        pytest -v
+      - uses: actions/checkout@v2
+        if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
+
+      - name: setup-python
+        if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: install
+        if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirements.txt
+
+      - name: lint
+        if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
+        run: |
+          flake8
+
+      - name: test
+        if: "!startsWith(needs.validate.outputs.commit, 'chore:')"
+        env:
+          A4KSTREAMING_IMDB_TOKEN: ${{ secrets.A4KSTREAMING_IMDB_TOKEN }}
+          A4KSTREAMING_PREMIUMIZE_APIKEY: ${{ secrets.A4KSTREAMING_PREMIUMIZE_APIKEY }}
+          A4KSTREAMING_REALDEBRID_APIKEY: ${{ secrets.A4KSTREAMING_REALDEBRID_APIKEY }}
+          A4KSTREAMING_ALLDEBRID_APIKEY: ${{ secrets.A4KSTREAMING_ALLDEBRID_APIKEY }}
+          A4KSTREAMING_PROVIDER_URL: ${{ secrets.A4KSTREAMING_PROVIDER_URL }}
+        run: |
+          pytest -v

CHANGELOG.md

@@ -1,3 +1,6 @@
+* [v1.36.0](https://github.com/newt-sc/a4kStreaming/releases/tag/plugin.video.a4kstreaming%2Fplugin.video.a4kstreaming-1.36.0):
+  * Change RD resolve order
+
 * [v1.35.0](https://github.com/newt-sc/a4kStreaming/releases/tag/plugin.video.a4kstreaming%2Fplugin.video.a4kstreaming-1.35.0):
   * Improve title result size calculation
 

a4kStreaming/explorer.py

@@ -2388,7 +2388,7 @@ def resolve_pm():
         parsed_response = core.json.loads(response.content)
         return parsed_response.get('content', [])
 
-    def resolve_rd(resolve_files='all'):
+    def resolve_rd(resolve_files='videos'):
         auth = core.utils.rd_auth_query_params(core, rd_apikey)
         request = core.debrid.realdebrid_cache(auth, result['magnet'])
         response = core.request.execute(core, request)
@@ -2445,11 +2445,11 @@ def resolve_rd(resolve_files='all'):
             parsed_response = core.json.loads(response.content)
 
             if len(parsed_response['links']) == 0:
-                if resolve_files == 'all':
+                if resolve_files == 'videos':
                     request = core.debrid.realdebrid_delete(auth, id)
                     core.request.execute(core, request)
-                    return resolve_rd(resolve_files='videos')
-                elif resolve_files == 'videos' and result['ref'].mediatype == 'episode':
+                    return resolve_rd(resolve_files='all')
+                elif resolve_files == 'all' and result['ref'].mediatype == 'episode':
                     request = core.debrid.realdebrid_delete(auth, id)
                     core.request.execute(core, request)
                     return resolve_rd(resolve_files='exact')

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.a4kstreaming"
        name="a4kStreaming"
-       version="1.35.0"
+       version="1.36.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -32,6 +32,9 @@ Designed for low-end devices and Estuary skin.
             <screenshot>screenshot-06.jpg</screenshot>
         </assets>
         <news>
+[v1.36.0]:
+  * Change RD resolve order
+
 [v1.35.0]:
   * Improve title result size calculation
 

packages/addons.xml

@@ -4,7 +4,7 @@
 <addons>
 <addon id="plugin.video.a4kstreaming"
        name="a4kStreaming"
-       version="1.35.0"
+       version="1.36.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -35,6 +35,9 @@ Designed for low-end devices and Estuary skin.
             <screenshot>screenshot-06.jpg</screenshot>
         </assets>
         <news>
+[v1.36.0]:
+  * Change RD resolve order
+
 [v1.35.0]:
   * Improve title result size calculation
 

packages/addons.xml.crc

@@ -1 +1 @@
-3b146c14efc081a97fef923789649c39a892c4d3
+aa674a50992422a3a66f0f1803516a8f8f0a9c25