Skip to content

Commit 490f601

Browse files
authored
Merge branch 'develop' into plugins
2 parents 5c69e68 + 86f2fce commit 490f601

File tree

30 files changed

+1940
-1309
lines changed

30 files changed

+1940
-1309
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
### Before submitting your issue:
1+
## Notice:
2+
The issue tracker, wiki,and discussions tab on GitHub is going to be archived/disabled in the near future for SickChill. All issues, discussions, support, guides, feature requests, and communication will be handled on [discord](https://discord.gg/FXre9qkHwE). Please consider raising your issue there instead.
3+
4+
## Before submitting your issue:
25

36
Enable debug logging in SickChill settings, reproduce the error (be sure to disable after the bug is fixed)
47

.github/workflows/pythonpackage.yml

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
20-
cancel-in-progress: true
20+
cancel-in-progress: false
2121

2222
env:
2323
SLEEP: 60
@@ -33,7 +33,7 @@ defaults:
3333

3434
jobs:
3535
Environment:
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-latest
3737
outputs:
3838
docker_tags: ${{ steps.docker.outputs.tags }}
3939
docker_labels: ${{ steps.docker.outputs.labels }}
@@ -81,34 +81,18 @@ jobs:
8181
Test:
8282
strategy:
8383
matrix:
84-
os: [ubuntu-22.04]
85-
python-version: [3.7, 3.8, 3.9, "3.10"]
84+
os: [ubuntu-latest]
85+
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
8686
experimental: [false]
8787
include:
88-
-
89-
os: ubuntu-22.04
90-
python-version: "3.11.0-rc.2"
91-
experimental: true
9288
-
9389
os: windows-latest
94-
python-version: "3.10"
95-
experimental: true
90+
python-version: "3.11"
91+
experimental: false
9692
-
9793
os: macos-latest
98-
python-version: "3.10"
99-
experimental: true
100-
-
101-
os: ubuntu-22.04
102-
python-version: "pypy3.9-v7.3.8"
103-
experimental: true
104-
-
105-
os: ubuntu-22.04
106-
python-version: "pypy3.8-v7.3.9"
107-
experimental: true
108-
-
109-
os: ubuntu-22.04
110-
python-version: "pypy3.7-v7.3.9"
111-
experimental: true
94+
python-version: "3.11"
95+
experimental: false
11296
fail-fast: true
11397
continue-on-error: ${{ matrix.experimental }}
11498
runs-on: ${{ matrix.os }}
@@ -155,32 +139,28 @@ jobs:
155139
name: Install yarn
156140
run: npm install -g yarn
157141
-
158-
name: Update pip
142+
name: Install python dependency tools
159143
run: |
160-
curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py
161-
poetry run python get-pip.py
162-
rm get-pip.py
144+
poetry run pip install --upgrade setuptools wheel
145+
poetry run pip install --upgrade pytest-github-actions-annotate-failures
163146
-
164-
name: Output poetry info
147+
name: Output tooling environment information
165148
run: |
166-
which poetry
167-
poetry env info
168-
python -V
149+
echo -e "$(poetry --version --ansi) is at $(which poetry)\n$(poetry env info --ansi)\n\v$(poetry --ansi run pip -V)"
169150
-
170-
name: Install dependencies
151+
name: Install sickchill
171152
run: |
172-
poetry run pip install --upgrade setuptools wheel
173153
poetry install --no-interaction --with dev --with speedups
174154
-
175-
if: success() && startsWith(runner.os, 'Linux') && matrix.python-version == '3.10'
155+
if: success() && startsWith(runner.os, 'Linux') && matrix.python-version == '3.11'
176156
name: Run yarn
177157
run: poetry run poe yarn
178158
-
179-
if: success() && startsWith(runner.os, 'Linux') && matrix.python-version == '3.10'
159+
if: success() && startsWith(runner.os, 'Linux') && matrix.python-version == '3.11'
180160
name: Lint Python
181161
run: poetry run poe lint
182162
-
183-
if: success() && startsWith(runner.os, 'Linux') && matrix.python-version == '3.10'
163+
if: success() && startsWith(runner.os, 'Linux') && matrix.python-version == '3.11'
184164
name: Lint and test Javascript
185165
run: poetry run poe yarn test
186166
-

README.md

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
1-
SickChill [![Build Status](https://github.com/SickChill/SickChill/actions/workflows/pythonpackage.yml/badge.svg)](https://github.com/SickChill/SickChill/actions/workflows/pythonpackage.yml?query=branch%3Amaster) [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) [![Donate](https://img.shields.io/badge/donations-appreciated-green.svg)](https://github.com/SickChill/SickChill/wiki/Donations)
2-
====================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
1+
# SickChill
32

4-
Huge thanks to JetBrains for providing "All Products Pack" licenses free of charge for SickChill developers as part of their support of OSS.
5-
[https://jb.gg/OpenSourceSupport](https://jb.gg/OpenSourceSupport)
3+
---
64

5+
### Important Notice*
6+
Issue/Bug tracking, feature requests, support, and developer communication is moving strictly to [discord](https://discord.gg/FXre9qkHwE) - please start making the habit to go there, rather than creating issues on GitHub. After a period of time GitHub issue tracker, discussions, and other social features will be disabled on GitHub.
77

8-
Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
8+
---
9+
[![Language](https://img.shields.io/github/languages/top/sickchill/sickchill?logo=python&style=plastic)](https://python.org)
10+
[![Build Status](https://img.shields.io/github/actions/workflow/status/sickchill/sickchill/pythonpackage.yml?logo=github&style=plastic)](https://github.com/SickChill/SickChill/actions/workflows/pythonpackage.yml?query=branch%3Amaster)
11+
[![Release Date](https://img.shields.io/github/release-date/sickchill/sickchill?logo=github&style=plastic)](https://github.com/SickChill/sickchill/releases)
12+
[![Last Commit](https://img.shields.io/github/last-commit/sickchill/sickchill?logo=github&style=plastic)](https://github.com/SickChill/sickchill/commits/master)
13+
[![Commits Since](https://img.shields.io/github/commits-since/sickchill/sickchill/latest/develop?logo=github&sort=date&style=plastic)](https://github.com/SickChill/sickchill/commits/master)
14+
[![Discord](https://img.shields.io/discord/502612977271439372?label=Discord&logo=discord&style=plastic)](https://discord.gg/FXre9qkHwE)
15+
[![Donate](https://img.shields.io/badge/$_donations-needed-green.svg?style=plastic)](https://github.com/SickChill/SickChill/wiki/Donations)
916

10-
#### Features
17+
---
18+
19+
### Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
20+
21+
### Features
1122
- Kodi/XBMC library updates, poster/banner/fanart downloads, and NFO/TBN generation
1223
- Configurable automatic episode renaming, sorting, and other processing
1324
- Easily see what episodes you're missing, are airing soon, and more
14-
- Automatic torrent/nzb searching, downloading, and processing at the qualities you want
15-
- Largest list of supported torrent and nzb providers, both public and private
25+
- Automatic torrent/nzb searching, sending to your client, and processing at the qualities you want
26+
- Largest list of supported torrent, newznab, and torznab providers - both public and private
1627
- Can notify Kodi, XBMC, Growl, Trakt, Twitter, and more when new episodes are available
17-
- Searches TheTVDB.com and AniDB.net for shows, seasons, episodes, and metadata
28+
- Searches [TheTVDB](https://thetvdb.com), [AniDB.net](https://anidb.net), [iMDB](https://imdb.com), [FanArt.tv](https://fanart.tv), and more for shows, seasons, episodes, and metadata
1829
- Episode status management allows for mass failing seasons/episodes to force retrying
1930
- DVD Order numbering for returning the results in DVD order instead of Air-By-Date order
2031
- Allows you to choose which indexer to have SickChill search its show info from when importing
@@ -27,36 +38,26 @@ Automatic Video Library Manager for TV Shows. It watches for new episodes of you
2738
- Real SSL certificate validation
2839
- Supports Anime shows
2940

30-
#### Installation/Setup
31-
32-
Visit the [Installation & Configuration guides page](https://github.com/SickChill/SickChill/wiki/Installation-&-Configuration-Guides) on our wiki
33-
34-
#### Dependencies
35-
36-
To run SickChill you will need Python 3.7+, preferably 3.10 or newer.
37-
38-
PyPy (python 3.7-3.9) 7.8.x+ is also supported.
39-
40-
#### More info
41-
41+
### Important Links
42+
* [Installation & Configuration](https://github.com/SickChill/SickChill/wiki/Installation-&-Configuration-Guides)
4243
* [Wiki](https://github.com/SickChill/SickChill/wiki)
43-
4444
* [FAQ](https://github.com/SickChill/SickChill/wiki/FAQ%27s-and-Fixes)
45+
* [Issue Tracker](https://discord.gg/FXre9qkHwE)
46+
* [Feature Requests](https://discord.gg/FXre9qkHwE)
47+
* [Supported providers](https://github.com/SickChill/SickChill/wiki/SickChill-Search-Providers)
48+
* [News](https://github.com/SickChill/sickchill.github.io/blob/master/sickchill-news/news.md)
49+
* [Changelog](https://github.com/SickChill/sickchill.github.io/blob/master/sickchill-news/CHANGES.md)
50+
* [Network Timezones](https://github.com/SickChill/sickchill.github.io/tree/master/sb_network_timezones)
51+
* [Scene Exceptions](https://github.com/SickChill/sickchill.github.io/tree/master/scene_exceptions)
4552

46-
* [Issue Tracker](https://github.com/SickChill/SickChill/issues)
53+
### Dependencies
4754

48-
#### Important notes on switching from other forks
55+
To run SickChill you will need Python 3.8+, preferably 3.11 or newer. PyPy (python 3.7-3.9) 7.8.x+ is also supported.
4956

50-
Before using this with your existing database (`sickbeard.db`) please make a backup copy of it and delete any other database files such as cache.db and failed.db if present.
57+
### Important notes on switching from other forks
5158

59+
Before using this with your existing database (`sickbeard.db`) please make a backup copy of it and delete any other database files such as cache.db and failed.db if present.
5260
We HIGHLY recommend starting out with no database files at all to make this a fresh start but the choice is at your own risk.
5361

54-
#### Supported providers
55-
56-
A full list can be found here: [Link](https://github.com/SickChill/SickChill/wiki/SickChill-Search-Providers)
57-
58-
#### News and Changelog
59-
[news.md and CHANGES.md have moved to a separate repo, click here](https://github.com/SickChill/SickChill.github.io)
60-
61-
62+
### Huge thanks to [JetBrains](https://jb.gg/OpenSourceSupport) for providing "All Products Pack" licenses free of charge for SickChill developers as part of their support of OSS.
6263
<a href="https://jb.gg/OpenSourceSupport"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" width="60" height="60"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_square.svg" width="60" height="60"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/PyCharm_icon.svg" width="60" height="60"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/IntelliJ_IDEA_icon.svg" width="60" height="60"></a>

frontend/templates/js/show.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'bootstrap/dist/css/bootstrap.min.css';

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
"eslint-plugin-no-use-extend-native": "^0.5.0",
4040
"eslint-plugin-node": "^11.1.0",
4141
"eslint-plugin-promise": "^6.0.0",
42-
"eslint-plugin-unicorn": "^46.0.0",
42+
"eslint-plugin-unicorn": "^47.0.0",
4343
"esm": "^3.2.25",
4444
"grunt": "^1.5.2",
4545
"grunt-bower-concat": "git+https://github.com/miigotu/grunt-bower-concat.git",
4646
"grunt-bower-task": "^0.6.1",
4747
"grunt-cli": "^1.2.0",
4848
"grunt-contrib-clean": "^2.0.0",
4949
"grunt-contrib-copy": "^1.0.0",
50-
"grunt-contrib-cssmin": "^4.0.0",
50+
"grunt-contrib-cssmin": "^5.0.0",
5151
"grunt-contrib-jshint": "^3.2.0",
5252
"grunt-contrib-sass": "^2.0.0",
5353
"grunt-contrib-uglify": "^5.0.1",
@@ -59,19 +59,19 @@
5959
"jquery": "^3.2.1",
6060
"load-grunt-tasks": "^5.1.0",
6161
"lodash": "^4.17.15",
62-
"mem-fs": "^2.2.1",
63-
"mem-fs-editor": "^9.5.0",
62+
"mem-fs": "^3.0.0",
63+
"mem-fs-editor": "^10.0.2",
6464
"mini-css-extract-plugin": "^2.6.1",
6565
"sass": "^1.55.0",
6666
"sass-loader": "^13.1.0",
67-
"snyk": "^1.1043.0",
67+
"snyk": "^1.1163.0",
6868
"style-loader": "^3.3.1",
6969
"toml": "^3.0.0",
70-
"webpack": "^5.74.0",
70+
"webpack": "^5.76.0",
7171
"webpack-cli": "^5.0.0",
7272
"webpack-dev-server": "^4.11.1",
7373
"workbox-webpack-plugin": "^6.5.4",
74-
"xo": "^0.53.1",
74+
"xo": "^0.54.2",
7575
"yarn-minify": "^1.0.1"
7676
},
7777
"ava": {

pyproject.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "sickchill"
3-
version = "2023.1.2"
3+
version = "2023.5.30"
44
description = 'Automatic Video Library Manager for TV Shows'
55
license = "GPL-3.0-or-later"
66

@@ -67,15 +67,13 @@ pytest-isort = "^3.0.0"
6767
flake8-pytest-style = "^1.5.1"
6868
flake8-commas = "^2.0.0"
6969
flake8-quotes = "^3.3.0"
70-
flake8-bandit = "^2.1.2"
7170
flake8-docstrings = "^1.6.0"
7271
flake9 = "^3.8.3"
7372
codecov = "^2.1.12"
7473
pytest = "^7.0.1"
7574
isort = "^5.10.1"
7675
poethepoet = ">=0.16,<0.20"
7776
po2json = "^0.2.2"
78-
bandit = "<=1.7.2"
7977
pre-commit = "^2.20.0"
8078

8179
[tool.poetry.group.speedups]
@@ -97,7 +95,7 @@ types-python-dateutil = "^2.8.19"
9795
types-python-slugify = ">=6.1,<9.0"
9896
types-requests = "^2.28.11"
9997
types-chardet = "^5.0.4"
100-
types-pytz = "^2022.2.1.0"
98+
types-pytz = ">=2022.2.1,<2024.0.0"
10199
types-setuptools = ">=65.3,<68.0"
102100
types-six = "^1.16.20"
103101

@@ -258,9 +256,8 @@ pybabel update
258256
[tool.poetry.dependencies]
259257
python = ">=3.7.2,<4"
260258
"bencode.py" = "^4.0.0"
261-
CacheControl = "^0.12.6"
262259
configobj = "^5.0.6"
263-
greenlet = {version = ">=1.1.2", allow-prereleases = true}
260+
greenlet = {version = ">=2.0.0", allow-prereleases = true}
264261
ipaddress = "^1.0.23"
265262
jsonrpclib-pelix = "^0.4.2"
266263
Mako = "^1.1.4"
@@ -304,3 +301,4 @@ beekeeper-alt = ">=2022.9.3"
304301
# stevedore dropped support for python 3.7
305302
stevedore = {version = "<=3.5.0", python = "<3.8"}
306303
importlib-metadata = {version = "<5.0.0", python = "<3.8"}
304+
cacheyou = "^23.2"
1.74 KB
Loading
2.04 KB
Loading
3.72 KB
Loading

sickchill/gui/slick/js/ajaxEpSearch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function updateImages(data) {
116116
function checkManualSearches() {
117117
let pollInterval = 5000;
118118
const showId = $('#showID').val();
119-
const url = showId !== undefined ? searchStatusUrl + '?show=' + showId : searchStatusUrl; // eslint-disable-line no-negated-condition
119+
const url = showId ? searchStatusUrl + '?show=' + showId : searchStatusUrl;
120120
$.ajax({
121121
url,
122122
success(data) {

0 commit comments

Comments
 (0)