From 9292cfaa00a11641821bf1ffc05dbb6c1b4f6b37 Mon Sep 17 00:00:00 2001 From: Q Date: Wed, 29 Apr 2020 15:51:02 +0300 Subject: [PATCH] transfer time, case insensitive --- shell/select-option.sh | 4 +++- web/transfer-time | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/shell/select-option.sh b/shell/select-option.sh index 36f7384..0c25f5f 100755 --- a/shell/select-option.sh +++ b/shell/select-option.sh @@ -300,7 +300,9 @@ for (( i=1; i<=$#; i++ )); do opts+=( "$value" ) done - +if [[ "${#opts[@]}" -eq 0 ]]; then + _help +fi select_option "${opts[@]}" exit $? } diff --git a/web/transfer-time b/web/transfer-time index 0c01d85..a58c8f0 100755 --- a/web/transfer-time +++ b/web/transfer-time @@ -1,6 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 -import argparse, sys, os +import argparse +import sys +import os import datetime @@ -145,8 +147,8 @@ def parse_speed(speed_string): return None (divisor_string, divider_string) = speed_string.split("/", 1) - divisor = parse_size(divisor_string) + if divisor == None: # Cannot parse return divisor @@ -177,22 +179,22 @@ if __name__ == "__main__": opts = parse_options() if opts.rate: - speed = parse_rate(opts.speed) + speed = parse_rate(opts.speed.lower()) if speed == None: print_err("Cannot parse rate ( ex. 3.5s/kb )") print_err("Rate: %s"%( opts.speed, )) sys.exit(1) else: - speed = parse_speed(opts.speed) + speed = parse_speed(opts.speed.lower()) if speed == None: print_err("Cannot parse speed ( ex. 3.5Mb/s )") print_err("Speed: %s"%( opts.speed, )) sys.exit(1) - size = parse_size(opts.size) - - if size == None: + if os.path.isfile(opts.size): size = get_files_size(opts.size) + else: + size = parse_size(opts.size.lower()) if size == None: print_err("Cannot parse size, and it's not a path either ( ex. 11Gb / file.name )")