starred/decluttarr
1
0
Fork 0
mirror of https://github.com/ManiMatter/decluttarr.git synced 2026-04-21 08:15:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of main.py, and fixing

Browse Source 
TypeError: unsupported operand type(s) for +: 'dict' and 'dict'
This commit is contained in:
Benjamin Harder
2024-03-29 14:47:16 +01:00
parent 571c4f64d2
commit bae0c67d13
14 changed files with 293 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/rest.py
View File

@@ -4,13 +4,13 @@ import asyncio
import requests
from requests.exceptions import RequestException
import json
from config.config import settings_dict
from config.config import settingsDict
# GET
async def rest_get(url, api_key=None, params=None, cookies=None):
try:
headers = {'X-Api-Key': api_key} if api_key else None
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.get(url, params=params, headers=headers, cookies=cookies, verify=settings_dict['SSL_VERIFICATION']))
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.get(url, params=params, headers=headers, cookies=cookies, verify=settingsDict['SSL_VERIFICATION']))
response.raise_for_status()
return response.json()
except requests.exceptions.HTTPError as e:
@@ -23,10 +23,10 @@ async def rest_get(url, api_key=None, params=None, cookies=None):
# DELETE
async def rest_delete(url, api_key, params=None):
if settings_dict['TEST_RUN']: return
if settingsDict['TEST_RUN']: return
try:
headers = {'X-Api-Key': api_key}
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.delete(url, params=params, headers=headers, verify=settings_dict['SSL_VERIFICATION']))
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.delete(url, params=params, headers=headers, verify=settingsDict['SSL_VERIFICATION']))
response.raise_for_status()
if response.status_code in [200, 204]:
return None
@@ -40,9 +40,9 @@ async def rest_delete(url, api_key, params=None):
# POST
async def rest_post(url, data=None, json=None, headers=None, cookies=None):
if settings_dict['TEST_RUN']: return
if settingsDict['TEST_RUN']: return
try:
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.post(url, data=data, json=json, headers=headers, cookies=cookies, verify=settings_dict['SSL_VERIFICATION']))
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.post(url, data=data, json=json, headers=headers, cookies=cookies, verify=settingsDict['SSL_VERIFICATION']))
response.raise_for_status()
if response.status_code in (200,201):
return None
@@ -57,10 +57,10 @@ async def rest_post(url, data=None, json=None, headers=None, cookies=None):
# PUT
async def rest_put(url, api_key, data):
if settings_dict['TEST_RUN']: return
if settingsDict['TEST_RUN']: return
try:
headers = {'X-Api-Key': api_key} | {"content-type": "application/json"}
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.put(url, data=data, headers=headers, verify=settings_dict['SSL_VERIFICATION']))
response = await asyncio.get_event_loop().run_in_executor(None, lambda: requests.put(url, data=data, headers=headers, verify=settingsDict['SSL_VERIFICATION']))
response.raise_for_status()
return response.json()
except RequestException as e: