mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2025-12-10 07:14:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure makefsdata.py generates valid variable names (#1841)

Browse source 
* Ensure makefsdata.py generates valid variable names

* Use mimetypes library in makefsdata.py

* Avoid generating duplicate variable names
This commit is contained in:
Nikhil Dabas 2024-08-20 23:01:45 +05:30 • committed by GitHub
parent e930bf3261
commit 789ea75c63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/rp2_common/pico_lwip/tools/makefsdata.py
View file

@ -1,30 +1,8 @@
#!/usr/bin/env python3
import argparse
import mimetypes
from pathlib import Path
file_types = {
"html": "text/html",
"htm": "text/html",
"shtml": "text/html",
"shtm": "text/html",
"ssi": "text/html",
"gif": "image/gif",
"png": "image/png",
"jpg": "image/jpeg",
"bmp": "image/bmp",
"ico": "image/x-icon",
"class": "application/octet-stream",
"cls": "application/octet-stream",
"js": "application/javascript",
"ram": "application/javascript",
"css": "text/css",
"swf": "application/x-shockwave-flash",
"xml": "text/xml",
"xsl": "application/pdf",
"pdf": "text/xml",
"json": "application/json",
"svg": "image/svg+xml"
}
import re
response_types = {
200: "HTTP/1.0 200 OK",
@ -41,9 +19,9 @@ def process_file(input_dir, file):
results = []
# Check content type
content_type = file_types[file.suffix[1:].lower()]
content_type, _ = mimetypes.guess_type(file)
if content_type is None:
raise RuntimeError(f"Unsupported file type {file.suffix}")
content_type = "application/octet-stream"
# file name
data = f"/{file.relative_to(input_dir)}\x00"
@ -103,8 +81,12 @@ def process_file_list(fd, input):
# make a variable name
var_name = str(file.relative_to(input_dir))
var_name = var_name.replace(".", "_")
var_name = var_name.replace("/", "_")
var_name = re.sub(r"\W+", "_", var_name, flags=re.ASCII)
# Add a suffix if the variable name is used already
if any(d["data_var"] == f"data_{var_name}" for d in data):
var_name += f"_{len(data)}"
data_var = f"data_{var_name}"
file_var = f"file_{var_name}"
@ -121,7 +103,7 @@ def process_file_list(fd, input):
if byte_count % 16 == 0:
fd.write("\n")
if byte_count % 16 != 0:
fd.write("\n")
fd.write("\n")
fd.write(f"}};\n\n")
# set the flags
@ -165,6 +147,11 @@ def run_tool():
)
args = parser.parse_args()
print(args.input)
mimetypes.init()
for ext in [".shtml", ".shtm", ".ssi"]:
mimetypes.add_type("text/html", ext)
with open(args.output, "w") as fd:
process_file_list(fd, args.input)