Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove trailing whitespace from python code #13

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove trailing whitespace from python code #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions pico_cart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ def read_code_from_rom(r, keep_compression=False, **opts):
def read_cart_from_rom(buffer, path=None, allow_tiny=False, **opts):
cart = Cart()
cart.name = path_basename(path)

with BinaryReader(BytesIO(buffer), big_end = True) as r:
if r.len() < k_cart_size and allow_tiny: # tiny rom, code only
cart.code, cart.code_rom = read_code_from_rom(r, **opts)

else:
cart.rom.replace(r.bytes(k_rom_size))
cart.code, cart.code_rom = read_code_from_rom(r, **opts)
Expand Down Expand Up @@ -115,7 +115,7 @@ def write_cart_to_tiny_rom(cart, force_compress=False, keep_compression=False, *
if keep_compression and cart.code_rom != None:
with BinaryReader(BytesIO(cart.code_rom), big_end = True) as code_r:
compressed_size = get_compressed_size(code_r)

w.bytes(cart.code_rom.get_block(0, compressed_size))
else:
compress_code(w, cart.code, force_compress=True, **opts)
Expand Down Expand Up @@ -168,13 +168,13 @@ def read_cart_from_image(data, **opts):
cart = read_cart_from_rom(data, **opts)
cart.screenshot = screenshot
return cart

def write_cart_to_image(cart, screenshot_path=None, title=None, res_path=None, **opts):
output = write_cart_to_rom(cart, with_trailer=True, **opts)

if res_path is None:
res_path = path_dirname(path_resolve(__file__))

with file_open(path_join(res_path, "template.png")) as template_f:
image = load_cart_image(template_f)
width, height = image.size
Expand All @@ -192,7 +192,7 @@ def write_cart_to_image(cart, screenshot_path=None, title=None, res_path=None, *
screenshot_surf.set_at((x, y), k_palette[cart.screenshot[x, y]])
screenshot_surf.unlock()
image.draw(screenshot_surf, k_screenshot_offset, k_screenshot_rect)

if title is None:
title = "\n".join(cart.get_title())
if title:
Expand All @@ -211,7 +211,7 @@ def write_cart_to_image(cart, screenshot_path=None, title=None, res_path=None, *
continue
image.draw(font_surf, k_title_offset + Point(x, y), chrect)
x += chrect.w

image.lock()
for y in range(height):
for x in range(width):
Expand All @@ -233,69 +233,69 @@ def write_cart_to_image(cart, screenshot_path=None, title=None, res_path=None, *

def read_cart_from_source(data, path=None, raw=False, preprocessor=None, **_):
cart = Cart()

def nybbles(line):
for b in line:
yield int(b, 16)

def nybble_groups(line, n):
for i in range(0, len(line), n):
yield nybbles(line[i:i+n])

def bytes(line):
for i in range(0, len(line), 2):
yield int(line[i] + line[i + 1], 16)

def ext_nybbles(line):
for b in line:
if 'v' >= b.lower() >= 'g':
yield ord(b.lower()) - ord('g') + 16
else:
yield int(b, 16)

header = "lua" if raw else None
code = []
code_line = 0
y = 0
for line_i, line in enumerate(data.split("\n")): # not splitlines, that eats a trailing empty line
clean = line.strip()

if line.startswith("__") and clean.endswith("__") and not raw: # may end with whitespace
header = clean[2:-2]
y = 0

elif header == "lua":
if y == 0:
code_line = line_i
else:
code.append("\n")
code.append(to_pico_chars(line))
y += 1

elif header == "gfx" and clean:
assert len(clean) == 0x80
x = 0
for b in nybbles(clean):
cart.rom.set4(mem_tile_addr(x, y), b)
x += 1
y += 1

elif header == "map" and clean:
assert len(clean) == 0x100
x = 0
for b in bytes(clean):
cart.rom.set8(mem_map_addr(x, y), b)
x += 1
y += 1

elif header == "gff" and clean:
assert len(clean) == 0x100
x = 0
for b in bytes(clean):
cart.rom.set8(mem_flag_addr(x, y), b)
x += 1
y += 1

elif header == "sfx" and clean:
assert len(clean) == 0xa8
x = 0
Expand All @@ -304,17 +304,17 @@ def ext_nybbles(line):
x += 1
x = 0
for bph, bpl, bw, bv, be in nybble_groups(clean[8:], 5):
value = bpl | ((bph & 0x3) << 4) | ((bw & 0x7) << 6) | ((bv & 0x7) << 9) | ((be & 0x7) << 12) | ((bw & 0x8) << 12)
value = bpl | ((bph & 0x3) << 4) | ((bw & 0x7) << 6) | ((bv & 0x7) << 9) | ((be & 0x7) << 12) | ((bw & 0x8) << 12)
cart.rom.set16(mem_sfx_addr(y, x), value)
x += 1
y += 1

elif header == "music" and clean:
assert len(clean) == 0xb and clean[2] == ' '
x = 0
flags = next(bytes(clean[:2]))
for b in bytes(clean[3:]):
value = b | (((flags >> x) & 1) << 7)
value = b | (((flags >> x) & 1) << 7)
cart.rom.set8(mem_music_addr(y, x), value)
x += 1
y += 1
Expand All @@ -331,11 +331,11 @@ def ext_nybbles(line):

elif header and header.startswith(k_meta_prefix):
cart.meta[header[len(k_meta_prefix):]].append(line.rstrip('\n'))

elif header == None and clean.startswith("version "):
cart.version_id = int(clean.split()[1])
cart.version_tuple = get_version_tuple(cart.version_id)

cart.name = path_basename(path)
cart.code, cart.code_map = preprocess_code(cart.name, path, "".join(code), code_line, preprocessor=preprocessor)
return cart
Expand All @@ -346,10 +346,10 @@ def write_cart_to_source(cart, unicode_caps=False, **_):

def nybbles(data):
return "".join('%01x' % b for b in data)

def nybble_groups(data):
return "".join([nybbles(group) for group in data])

def bytes(data):
return "".join('%02x' % b for b in data)

Expand All @@ -366,7 +366,7 @@ def remove_empty_section_lines(num_spaces=0):
lines.pop()
else:
break

lines.append("__lua__")
lines.append(from_pico_chars(cart.code, unicaps=unicode_caps))

Expand All @@ -383,7 +383,7 @@ def remove_empty_section_lines(num_spaces=0):
lines.append("__gff__")
for y in range(2):
lines.append(bytes(cart.rom.get8(mem_flag_addr(x, y)) for x in range(128)))
remove_empty_section_lines()
remove_empty_section_lines()

lines.append("__sfx__")
for y in range(64):
Expand All @@ -400,13 +400,13 @@ def remove_empty_section_lines(num_spaces=0):
ids = bytes(ch & 0x7f for ch in chans)
lines.append(flags + " " + ids)
remove_empty_section_lines(num_spaces=1)

if cart.screenshot:
lines.append("__label__")
for y in range(128):
lines.append(ext_nybbles(cart.screenshot[x, y] for x in range(128)))
remove_empty_section_lines()

for meta, metalines in cart.meta.items():
lines.append("__%s__" % (k_meta_prefix + meta))
lines += metalines
Expand Down Expand Up @@ -439,12 +439,12 @@ def read_cart_from_url(url, size_handler=None, **opts):
raise Exception("Invalid url - no '?'")

code, gfx = None, None

url_params = url.split("?", 1)[1]
for url_param in url_params.split("&"):
if "=" not in url_param:
raise Exception("Invalid url param: %s" % url_param)

key, value = url_param.split("=", 1)
if key == "c":
code = value
Expand Down Expand Up @@ -482,7 +482,7 @@ def read_cart_from_url(url, size_handler=None, **opts):
k_url_prefix = "https://www.pico-8-edu.com"

def write_cart_to_url(cart, url_prefix=k_url_prefix, force_compress=False, size_handler=None, **opts):
raw_code = write_cart_to_tiny_rom(cart, **opts)
raw_code = write_cart_to_tiny_rom(cart, **opts)
code = base64.b64encode(raw_code, k_base64_alt_chars)

rect = iter_rect(128, 128)
Expand Down Expand Up @@ -517,7 +517,7 @@ def write_cart_to_url(cart, url_prefix=k_url_prefix, force_compress=False, size_
url += "/?c=" + code.decode()
if gfx:
url += "&g=" + "".join(gfx)

if size_handler:
print_url_size(len(url), handler=size_handler)
return url
Expand All @@ -541,7 +541,7 @@ def read_cart_autodetect(path, **opts):
# cart?
if text.startswith("pico-8 cartridge") or text.startswith("__lua__"):
return read_cart_from_source(text, path=path, **opts)

rtext = text.rstrip()

# clip?
Expand All @@ -554,7 +554,7 @@ def read_cart_autodetect(path, **opts):

# plain text?
return read_cart_from_source(text, raw=True, path=path, **opts)

except UnicodeDecodeError: # required to happen for pngs
return read_cart(path, CartFormat.png, **opts)

Expand Down Expand Up @@ -582,7 +582,7 @@ class PicoPreprocessor:
def __init__(m, strict=True, include_handler=None):
m.strict = strict
m.include_handler = include_handler

def start(m, path, code):
pass

Expand Down Expand Up @@ -617,7 +617,7 @@ def handle(m, path, code, i, start_i, out_i, outparts, outmappings):

def handle_inline(m, path, code, i, start_i, out_i, outparts, outmappings):
return True, i + 1, start_i, out_i

def finish(m, path, code):
pass

Expand All @@ -629,7 +629,7 @@ def preprocess_code(name, path, code, start_line=0, preprocessor=None):
outmappings = []
i = start_i = out_i = 0
active = True

if preprocessor is None:
preprocessor = PicoPreprocessor()
preprocessor.start(path, code)
Expand Down Expand Up @@ -757,7 +757,7 @@ def read_js_package(text):
cartdata_raw = re.search("var\s+_cartdat\s*=\s*\[(.*?)\]", text, re.S)
if not cartdata_raw:
fail("can't find _cartdat var in js")

cartdata = bytearray(k_cart_size * len(carts))
for i, b in enumerate(cartdata_raw.group(1).split(",")):
cartdata[i] = int(b.strip())
Expand Down
Loading