PsychoticNinja/oddluck-limnoria-plugins
1
0
Fork 0
mirror of https://github.com/oddluck/limnoria-plugins.git synced 2025-04-29 06:51:12 -05:00
Code Issues Projects Releases Wiki Activity

YouTube\IMDb\Lyrics: simplify requests

Browse Source
This commit is contained in:
oddluck 2020-02-25 08:24:51 +00:00
parent c653c5edee
commit a8d7435c53
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IMDb/plugin.py
View File

@ -36,8 +36,6 @@ import supybot.ircutils as ircutils
import supybot.ircmsgs as ircmsgs import supybot.ircmsgs as ircmsgs
import supybot.callbacks as callbacks import supybot.callbacks as callbacks
import requests import requests
import json
import re
from fake_useragent import UserAgent from fake_useragent import UserAgent
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from urllib.parse import urljoin, urlparse from urllib.parse import urljoin, urlparse
@ -85,16 +83,14 @@ class IMDb(callbacks.Plugin):
channel = msg.args[0] channel = msg.args[0]
result = None result = None
ua = UserAgent()
headers = {'User-Agent':str(ua.random)}
self.log.info("IMDb: requesting %s" % omdb_url) self.log.info("IMDb: requesting %s" % omdb_url)
try: try:
request = requests.get(omdb_url, timeout=10, headers=headers) request = requests.get(omdb_url, timeout=10)
if request.status_code == requests.codes.ok: if request.status_code == requests.codes.ok:
response = json.loads(request.text) response = request.json()
not_found = "Error" in response not_found = "Error" in response
unknown_error = response["Response"] != "True" unknown_error = response["Response"] != "True"

7
YouTube/plugin.py
View File

@ -38,7 +38,6 @@ import supybot.callbacks as callbacks
import supybot.log as log import supybot.log as log
import requests import requests
import pendulum import pendulum
import json
import re import re
from jinja2 import Template from jinja2 import Template
from fake_useragent import UserAgent from fake_useragent import UserAgent
@ -172,8 +171,6 @@ class YouTube(callbacks.Plugin):
channel = msg.args[0] channel = msg.args[0]
result = None result = None
ua = UserAgent()
headers = {'User-Agent':str(ua.random)}
yt_template = Template(self.registryValue("template", dynamic.channel)) yt_template = Template(self.registryValue("template", dynamic.channel))
title = "" title = ""
@ -191,11 +188,11 @@ class YouTube(callbacks.Plugin):
log.debug("YouTube: requesting %s" % (api_url)) log.debug("YouTube: requesting %s" % (api_url))
request = requests.get(api_url, headers=headers) request = requests.get(api_url)
ok = request.status_code == requests.codes.ok ok = request.status_code == requests.codes.ok
if ok: if ok:
response = json.loads(request.text) response = request.json()
if response: if response:
try: try: