From 23fba2520a857dd7b8e7512d68bddb09d805f4fb Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Thu, 17 Apr 2014 16:13:55 -0500 Subject: [PATCH] When using --mini and no extension is found, try all of the standard upload extensions. Fixes #62 --- speedtest_cli.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/speedtest_cli.py b/speedtest_cli.py index 297702e..5c47d2e 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -543,6 +543,19 @@ def speedtest(): text = f.read() f.close() extension = re.findall('upload_extension: "([^"]+)"', text.decode()) + if not extension: + for ext in ['php', 'asp', 'aspx', 'jsp']: + try: + f = urlopen('%s/speedtest/upload.%s' % (args.mini, ext)) + except: + pass + else: + data = f.read().strip() + if (f.code == 200 and + len(data.splitlines()) == 1 and + re.match('size=[0-9]', data)): + extension = [ext] + break if not urlparts or not extension: print_('Please provide the full URL of your Speedtest Mini server') sys.exit(1)