no more python2 support

This commit is contained in:
2020-08-17 13:01:42 +03:00
parent 60acba2225
commit 2f0fd26db0
7 changed files with 30 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import argparse, sys, os, subprocess, time
from subprocess import Popen, PIPE, STDOUT
from io import BytesIO
@@ -7,6 +7,7 @@ ROOTURL="{{ rooturl }}"
SHARE="{{ name }}"
TOKEN="{{ token }}"
class ETA():
def __init__(self,total):
self.total = total
@@ -48,11 +49,15 @@ class ETA():
)
)
def split_upload(path, opts):
try:
size = int(subprocess.check_output(['du','-b',path]).split("\t")[0])
size = int(subprocess.check_output(['du','-b',path]).decode().split("\t")[0])
except KeyboardInterrupt:
size = 0
except ValueError as e:
print(e)
sys.exit(1)
eta = ETA(size)
eta.update(0)
split_bytes = opts.split * 1024 * 1024
@@ -81,7 +86,7 @@ def split_upload(path, opts):
chunk = reader.read(split_bytes)
part = 0
eta_str = "ETA"
while chunk != "":
while chunk != b"":
chunk_name = ".%s.part.%03d"%(
basename,
part
@@ -113,20 +118,20 @@ def split_upload(path, opts):
def is_chunk_sent(name, opts):
p = Popen(
[
'curl','-s',
'curl','-fsL',
'%sfile/size/%s/%s/%s'%(opts.rooturl, opts.share, opts.token, name)
],
stdout=PIPE,
stderr=PIPE
)
stdout_data, stderr_data = p.communicate()
return stdout_data == str(opts.split * 1024 * 1024)
return stdout_data.decode() == str(opts.split * 1024 * 1024)
def join_chunks(name,parts,opts):
p = Popen(
[
'curl',
'curl','-fL',
'-F','filename=%s'%(name,),
'-F','parts=%d'%(parts,),
'%supload_join/%s/%s'%(opts.rooturl, opts.share, opts.token)
@@ -135,7 +140,7 @@ def join_chunks(name,parts,opts):
stderr=PIPE
)
stdout_data, stderr_data = p.communicate()
print(stdout_data)
print(stdout_data.decode())
def parse_options():