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

a2m better url handling

Browse Source
This commit is contained in:
Gordon Shumway 2019-05-29 19:23:45 -04:00 committed by GitHub
parent d94ce7ab66
commit 430a4e6fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ASCII/plugin.py
View File

@ -21,7 +21,6 @@ from fake_useragent import UserAgent
from colour.difference import * from colour.difference import *
import re import re
import pexpect import pexpect
import urllib
import time import time
import random as random import random as random
from x256 import x256 from x256 import x256
@ -755,14 +754,12 @@ class ASCII(callbacks.Plugin):
header = {'User-Agent':str(ua.random)} header = {'User-Agent':str(ua.random)}
r = requests.head(url, headers=header) r = requests.head(url, headers=header)
try: try:
if int(r.headers["content-length"]) > 1000000: if "text/plain" in r.headers["content-type"] or "application/octet-stream" in r.headers["content-type"] and int(r.headers["content-length"]) < 1000000:
irc.reply("Invalid file type.")
return
else:
path = os.path.dirname(os.path.abspath(__file__)) path = os.path.dirname(os.path.abspath(__file__))
filepath = "{0}/tmp".format(path) filepath = "{0}/tmp".format(path)
filename = "{0}/{1}".format(filepath, url.split('/')[-1]) filename = "{0}/{1}".format(filepath, url.split('/')[-1])
urllib.request.urlretrieve(url, filename) r = requests.get(url, headers=header)
open(filename, 'wb').write(r.content)
try: try:
output = pexpect.run('a2m {0} {1}'.format(opts.strip(), str(filename))) output = pexpect.run('a2m {0} {1}'.format(opts.strip(), str(filename)))
try: try:
@ -772,8 +769,11 @@ class ASCII(callbacks.Plugin):
except: except:
irc.reply("Error. Have you installed A2M? https://github.com/tat3r/a2m", private=False, notice=False) irc.reply("Error. Have you installed A2M? https://github.com/tat3r/a2m", private=False, notice=False)
return return
else:
irc.reply("Invalid file type.")
return
except: except:
irc.reply("Invalid file type.", private=False, notice=False) irc.reply("Invalid file type.")
return return
paste = "" paste = ""
self.stopped[msg.args[0]] = False self.stopped[msg.args[0]] = False