blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-05-02 22:36:37 +08:00
Code Issues Projects Releases Wiki Activity

Fix servefiles Python 2 compatibility.

Browse Source
This commit is contained in:
Steveice10 2017-02-22 22:40:21 -08:00
parent 54572a02e1
commit 39e1718c8d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servefiles/servefiles.py
View File

@ -21,7 +21,7 @@ except ImportError:
from urllib.request import pathname2url from urllib.request import pathname2url
if len(sys.argv) < 3 or len(sys.argv) > 5: if len(sys.argv) < 3 or len(sys.argv) > 5:
print('Usage:', sys.argv[0], '<target ip> <file / directory> [host ip] [host port]') print('Usage: ' + sys.argv[0] + ' <target ip> <file / directory> [host ip] [host port]')
sys.exit(1) sys.exit(1)
accepted_extension = ('.cia', '.tik', '.cetk') accepted_extension = ('.cia', '.tik', '.cetk')
@ -30,7 +30,7 @@ target_path = sys.argv[2]
hostPort = 8080 # Default value hostPort = 8080 # Default value
if not os.path.exists(target_path): if not os.path.exists(target_path):
print(target_path + ': No such file or directory.', file=sys.stderr) print(target_path + ': No such file or directory.')
sys.exit(1) sys.exit(1)
if len(sys.argv) >= 4: if len(sys.argv) >= 4:
@ -49,7 +49,7 @@ if os.path.isfile(target_path):
file_list_payload = baseUrl + quote(os.path.basename(target_path)) file_list_payload = baseUrl + quote(os.path.basename(target_path))
directory = os.path.dirname(target_path) # get file directory directory = os.path.dirname(target_path) # get file directory
else: else:
print('Unsupported file extension. Supported extensions are:', accepted_extension, file=sys.stderr) print('Unsupported file extension. Supported extensions are: ' + accepted_extension)
sys.exit(1) sys.exit(1)
else: else:
@ -59,7 +59,7 @@ else:
file_list_payload += baseUrl + quote(file) + '\n' file_list_payload += baseUrl + quote(file) + '\n'
if len(file_list_payload) == 0: if len(file_list_payload) == 0:
print('No files to serve.', file=sys.stderr) print('No files to serve.')
sys.exit(1) sys.exit(1)
file_list_payloadBytes = file_list_payload.encode('ascii') file_list_payloadBytes = file_list_payload.encode('ascii')
@ -68,15 +68,15 @@ if directory and directory != '.': # doesn't need to move if it's already the c
os.chdir(directory) # set working directory to the right folder to be able to serve files os.chdir(directory) # set working directory to the right folder to be able to serve files
print('\nURLs:') print('\nURLs:')
print(file_list_payload, '\n') print(file_list_payload + '\n')
print('Opening HTTP server on port', hostPort) print('Opening HTTP server on port ' + str(hostPort))
server = TCPServer(('', hostPort), SimpleHTTPRequestHandler) server = TCPServer(('', hostPort), SimpleHTTPRequestHandler)
thread = threading.Thread(target=server.serve_forever) thread = threading.Thread(target=server.serve_forever)
thread.start() thread.start()
try: try:
print('Sending URL(s) to', target_ip, 'on port 5000...') print('Sending URL(s) to ' + target_ip + ' on port 5000...')
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect((target_ip, 5000)) sock.connect((target_ip, 5000))
sock.sendall(struct.pack('!L', len(file_list_payloadBytes)) + file_list_payloadBytes) sock.sendall(struct.pack('!L', len(file_list_payloadBytes)) + file_list_payloadBytes)
@ -84,9 +84,9 @@ try:
time.sleep(0.05) time.sleep(0.05)
sock.close() sock.close()
except Exception as e: except Exception as e:
print('An error occurred:', str(e), file=sys.stderr) print('An error occurred: ' + str(e))
server.shutdown() server.shutdown()
sys.exit(1) sys.exit(1)
print('Shutting down HTTP server ...') print('Shutting down HTTP server...')
server.shutdown() server.shutdown()