Skip to content

Commit

Permalink
Merge pull request Kometa-Team#2069 from Kometa-Team/requests-update
Browse files Browse the repository at this point in the history
created requests module to handle all outgoing requests
  • Loading branch information
meisnate12 committed May 28, 2024
2 parents 7d51741 + fd97fd7 commit 67fc3ca
Show file tree
Hide file tree
Showing 47 changed files with 985 additions and 811 deletions.
5 changes: 5 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ AAC
accessModes
Addon
Adlib
AFI's
Amblin
analytics
AniDB
Expand All @@ -19,6 +20,7 @@ Arrowverse
Atmos
Avenir
BAFTA
Bambara
BBFC
bearlikelion
Berlinale
Expand Down Expand Up @@ -56,6 +58,7 @@ customizable
customizations
César
dbader
d'Or
de
deva
DIIIVOY
Expand Down Expand Up @@ -177,6 +180,7 @@ microsoft
mikenobbs
minikube
mnt
Mojo's
monetization
Mossi
MPAA
Expand All @@ -202,6 +206,7 @@ OMDb
oscar
OSX
ozzy
Palme
pathing
PCM
PersistentVolumeClaim
Expand Down
12 changes: 6 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Please include a summary of the changes.

Please delete options that are not relevant.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Documentation change (non-code changes affecting only the wiki)
- [ ] Infrastructure change (changes related to the github repo, build process, or the like)
- [] Bug fix (non-breaking change which fixes an issue)
- [] New feature (non-breaking change which adds functionality)
- [] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [] Documentation change (non-code changes affecting only the wiki)
- [] Infrastructure change (changes related to the github repo, build process, or the like)

## Checklist

- [ ] My code was submitted to the nightly branch of the repository.
- [] My code was submitted to the nightly branch of the repository.
27 changes: 27 additions & 0 deletions .github/workflows/merge-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Merge Nightly into Develop

on:
workflow_dispatch:

jobs:
merge-develop:
runs-on: ubuntu-latest
steps:

- name: Create App Token
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.APP_ID }}
private-key: ${{ secrets.APP_TOKEN }}

- name: Check Out Repo
uses: actions/checkout@v4
with:
token: ${{ steps.app-token.outputs.token }}
ref: nightly
fetch-depth: 0

- name: Push Nightly into Develop
run: |
git push origin refs/heads/nightly:refs/heads/develop
27 changes: 27 additions & 0 deletions .github/workflows/merge-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Merge Develop into Master

on:
workflow_dispatch:

jobs:
merge-master:
runs-on: ubuntu-latest
steps:

- name: Create App Token
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.APP_ID }}
private-key: ${{ secrets.APP_TOKEN }}

- name: Check Out Repo
uses: actions/checkout@v4
with:
token: ${{ steps.app-token.outputs.token }}
ref: develop
fetch-depth: 0

- name: Push Develop into Master
run: |
git push origin refs/heads/develop:refs/heads/master
12 changes: 0 additions & 12 deletions .github/workflows/spellcheck.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Validate Pull Request

on: pull_request

jobs:
validate-pull:
runs-on: ubuntu-latest
steps:

- name: Display Refs
run: |
echo "Base Repo: ${{ github.event.pull_request.base.repo.full_name }}"
echo "Base Ref: ${{ github.base_ref }}"
echo "Head Repo: ${{ github.event.pull_request.head.repo.full_name }}"
echo "Head Ref: ${{ github.head_ref }}"
- name: Check Base Branch
if: github.base_ref == 'master' || github.base_ref == 'develop'
run: |
echo "ERROR: Pull Requests cannot be submitted to master or develop. Please submit the Pull Request to the nightly branch"
exit 1
- name: Checkout Repo
uses: actions/checkout@v4

- name: Run Spellcheck
uses: rojopolis/spellcheck-github-actions@0.36.0
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1-develop24
2.0.1-develop26
25 changes: 0 additions & 25 deletions docs/config/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -934,31 +934,6 @@ The available setting attributes which can be set at each level are outlined bel
- metadata
```

??? blank "`verify_ssl` - Turn SSL Verification on or off.<a class="headerlink" href="#verify-ssl" title="Permanent link">¶</a>"

<div id="verify-ssl" />Turn SSL Verification on or off.

???+ note

set to false if your log file shows any errors similar to "SSL: CERTIFICATE_VERIFY_FAILED"

<hr style="margin: 0px;">

**Attribute:** `verify_ssl`

**Levels with this Attribute:** Global

**Accepted Values:** `true` or `false`

**Default Value:** `true`

???+ example "Example"
```yaml
settings:
verify_ssl: false
```

??? blank "`custom_repo` - Used to set up the custom `repo` [file block type](files.md#location-types-and-paths).<a class="headerlink" href="#custom-repo" title="Permanent link">¶</a>"

<div id="custom-repo" />Specify where the `repo` attribute's base is when defining `collection_files`, `metadata_files`, `playlist_file` and `overlay_files`.
Expand Down
1 change: 1 addition & 0 deletions docs/defaults/collection_list.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ These collections are applied by calling the below paths into the `collection_fi
| [Trakt Charts](chart/trakt.md)<sup>2</sup> | `trakt` | Trakt Popular, Trakt Trending | :fontawesome-solid-circle-check:{ .green } | :fontawesome-solid-circle-check:{ .green } |
| [AniList Charts](chart/anilist.md) | `anilist` | AniList Popular, AniList Season | :fontawesome-solid-circle-check:{ .green } | :fontawesome-solid-circle-check:{ .green } |
| [MyAnimeList Charts](chart/myanimelist.md) | `myanimelist` | MyAnimeList Popular, MyAnimeList Top Rated | :fontawesome-solid-circle-check:{ .green } | :fontawesome-solid-circle-check:{ .green } |
| [Letterboxd Charts](chart/letterboxd.md) | `letterboxd` | Letterboxd Top 250, Top 250 Most Fans | :fontawesome-solid-circle-check:{ .green } | :fontawesome-solid-circle-xmark:{ .red } |
| [Other Charts](chart/other.md) | `other_chart` | AniDB Popular, Common Sense Selection | :fontawesome-solid-circle-check:{ .green } | :fontawesome-solid-circle-check:{ .green } |

<sup>1</sup> Requires [Tautulli Authentication](../config/tautulli.md)
Expand Down
3 changes: 2 additions & 1 deletion docs/defaults/collections.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ This is the default Kometa collection ordering:
| `basic` | `010` |
| `anilist` | `020` |
| `imdb` | `020` |
| `letterboxd` | `020` |
| `myanimelist` | `020` |
| `other_chart` | `020` |
| `tautulli` | `020` |
Expand Down Expand Up @@ -211,4 +212,4 @@ libraries:

{%
include-markdown "./example.md"
%}
%}
26 changes: 26 additions & 0 deletions docs/kometa/environmental.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,32 @@ different ways to specify these things.
docker run -it -v "X:\Media\Kometa\config:/config:rw" kometateam/kometa --timeout 360
```

??? blank "No Verify SSL&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`-nv`/`--no-verify-ssl`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`KOMETA_NO_VERIFY_SSL`<a class="headerlink" href="#no-verify-ssl" title="Permanent link">¶</a>"

<div id="no-verify-ssl" />Turn SSL Verification off.

???+ note

set to false if your log file shows any errors similar to "SSL: CERTIFICATE_VERIFY_FAILED"

<hr style="margin: 0px;">

**Accepted Values:** Integer (value is in seconds)

**Shell Flags:** `-nv` or `--no-verify-ssl` (ex. `--no-verify-ssl`)

**Environment Variable:** `KOMETA_NO_VERIFY_SSL` (ex. `KOMETA_NO_VERIFY_SSL=true`)

!!! example
=== "Local Environment"
```
python kometa.py --no-verify-ssl
```
=== "Docker Environment"
```
docker run -it -v "X:\Media\Kometa\config:/config:rw" kometateam/kometa --no-verify-ssl
```

??? blank "Collections Only&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`-co`/`--collections-only`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`KOMETA_COLLECTIONS_ONLY`<a class="headerlink" href="#collections-only" title="Permanent link">¶</a>"

<div id="collections-only" />Only run collection YAML files, skip library operations, metadata, overlays, and playlists.
Expand Down
Loading

0 comments on commit 67fc3ca

Please sign in to comment.