diff --git a/README.md b/README.md index 29e8b9840f8..3fb3c7d84ca 100644 --- a/README.md +++ b/README.md @@ -331,9 +331,12 @@ quotes, even if it's `Int`, `Bool` or `List`. - `USENET_SERVERS`: list of dictionaries, you can add as much as you want and there is a button for servers in sabnzbd settings to edit current servers and add new servers. - ***[{'name': 'main', 'host': '', 'port': 5126, 'timeout': 60, 'username': '', 'password': '', 'connections': 8, 'ssl': 1, 'ssl_verify': 2, 'ssl_ciphers': '', 'enable': 1, 'required': 0, 'optional': 0, 'retention': 0, 'send_group': 0, 'priority': 0}]*** + ***[{'name': 'main', 'host': '', 'port': 563, 'timeout': 60, 'username': '', 'password': '', 'connections': 8, 'ssl': 1, 'ssl_verify': 2, 'ssl_ciphers': '', 'enable': 1, 'required': 0, 'optional': 0, 'retention': 0, 'send_group': 0, 'priority': 0}]*** + - [READ THIS FOR MORE INFORMATION](https://sabnzbd.org/wiki/configuration/4.2/servers) + - **NOTE**: Enable port 8070 in your vps to access sabnzbd full web interface + **10. RSS** - `RSS_DELAY`: Time in seconds for rss refresh interval. Recommended `600` second at least. Default is `600` in @@ -833,4 +836,4 @@ ETH Address: 0xf798a8a1c72d593e16d8f3bb619ebd1a093c7309 ``` ------ \ No newline at end of file +----- diff --git a/aria-nox-nzb.sh b/aria-nox-nzb.sh index 86d61e9ad32..8a7e7dc238f 100755 --- a/aria-nox-nzb.sh +++ b/aria-nox-nzb.sh @@ -8,4 +8,4 @@ aria2c --allow-overwrite=true --auto-file-renaming=true --bt-enable-lpd=true --b --content-disposition-default-utf8=true --user-agent=Wget/1.12 --peer-agent=qBittorrent/4.5.2 --quiet=true \ --summary-interval=0 --max-upload-limit=1K qbittorrent-nox -d --profile="$(pwd)" -sabnzbdplus -f sabnzbd/SABnzbd.ini -s 127.0.0.1:8070 -b 0 -d -c -l 0 --console \ No newline at end of file +sabnzbdplus -f sabnzbd/SABnzbd.ini -s :::8070 -b 0 -d -c -l 0 --console \ No newline at end of file diff --git a/bot/helper/mirror_leech_utils/status_utils/nzb_status.py b/bot/helper/mirror_leech_utils/status_utils/nzb_status.py index d1b94caf1ff..fa45d6114c4 100644 --- a/bot/helper/mirror_leech_utils/status_utils/nzb_status.py +++ b/bot/helper/mirror_leech_utils/status_utils/nzb_status.py @@ -17,7 +17,7 @@ async def get_download(client, nzo_id, old_info=None): if res["queue"]["slots"]: slot = res["queue"]["slots"][0] if msg := slot["labels"]: - LOGGER.warning(msg.join(" | ")) + LOGGER.warning(" | ".join(msg)) return slot return old_info except Exception as e: diff --git a/docker-compose.yml b/docker-compose.yml index 6458bf144a9..e4a5e51a38a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,3 +8,4 @@ services: ports: - "80:80" - "8080:8080" + - "8070:8070" diff --git a/sabnzbd/SABnzbd.ini b/sabnzbd/SABnzbd.ini index 30a71f92242..f4014cf7606 100644 --- a/sabnzbd/SABnzbd.ini +++ b/sabnzbd/SABnzbd.ini @@ -17,7 +17,7 @@ check_new_rel = 1 auto_browser = 1 language = en enable_https_verification = 1 -host = 127.0.0.1 +host = :: port = 8070 https_port = "" username = "" @@ -30,7 +30,7 @@ https_cert = server.cert https_key = server.key https_chain = "" enable_https = 0 -inet_exposure = 0 +inet_exposure = 4 api_key = mltb nzb_key = "" socks5_proxy_url = "" diff --git a/sabnzbdapi/requests.py b/sabnzbdapi/requests.py index a64f532ffde..cb736afd08e 100644 --- a/sabnzbdapi/requests.py +++ b/sabnzbdapi/requests.py @@ -72,6 +72,7 @@ async def call( params |= kwargs requests_kwargs = {**self._HTTPX_REQUETS_ARGS, **requests_args} retries = 5 + response = None for retry_count in range(retries): try: res = await session.request( @@ -81,11 +82,14 @@ async def call( **requests_kwargs, ) response = res.json() + break except DecodingError as e: raise DecodingError(f"Failed to decode response!: {res.text}") from e except APIConnectionError as err: if retry_count >= (retries - 1): raise err + if response is None: + raise APIConnectionError("Failed to connect to API!") return response async def check_login(self):