muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loggoing strings

Browse Source
This commit is contained in:
sanjayk03-dev
2024-06-04 02:06:46 +05:30
parent ce82047afe
commit 7e76331204
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/py/bbctrl/Web.py
View File

@@ -7,6 +7,7 @@ import subprocess
import socket import socket
from tornado.web import HTTPError from tornado.web import HTTPError
from tornado import gen from tornado import gen
from tornado.escape import url_unescape
import re import re
import bbctrl import bbctrl
from urllib.request import urlopen from urllib.request import urlopen
@@ -614,6 +615,7 @@ class MacrosDownloadHandler(bbctrl.APIHandler):
def get(self,filename): def get(self,filename):
if not filename: if not filename:
raise HTTPError(400, 'Missing filename') raise HTTPError(400, 'Missing filename')
filename = filename[1:]
files = filename.split(',') files = filename.split(',')
self.get_log('Macros Download').info('files ' + ",".join(files)) self.get_log('Macros Download').info('files ' + ",".join(files))
@@ -621,8 +623,10 @@ class MacrosDownloadHandler(bbctrl.APIHandler):
zip_file = zipfile.ZipFile(buffer, mode="w") zip_file = zipfile.ZipFile(buffer, mode="w")
for filename in files: for filename in files:
filepath = self.get_upload(filename).encode('utf8') filename = os.path.basename(url_unescape(filename))
filename = os.path.basename(filepath) self.get_log('Macros Download').info('filename ' + filename)
filepath = self.get_upload(filename)
self.get_log('Macros Download').info('filepath: ' + filepath)
zip_file.write(filepath, filename) zip_file.write(filepath, filename)
zip_file.close() zip_file.close()
buffer.seek(0) buffer.seek(0)