Skip to content

Commit

Permalink
Fixed line endings hopefully for real this time
Browse files Browse the repository at this point in the history
  • Loading branch information
Kataiser committed Dec 30, 2024
1 parent 4d8c7a7 commit 4a10465
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions game_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,7 @@ def sync_test(project_id: int, force: bool):
new_time_line = tas_updated[tas_parsed_new.finaltime_line_num]
tas_lines_og[tas_parsed.finaltime_line_num] = f'{new_time_line}\n'
commit_message = f"{'+' if frame_diff > 0 else ''}{frame_diff}f {tas_filename} ({tas_parsed_new.finaltime_trimmed})"
raw_uses_crlf = tas_file_raw.count(b'\r\n') >= tas_file_raw.count(b'\n')
queued_update_commits.append((file_path_repo, tas_lines_og, raw_uses_crlf, commit_message))
queued_update_commits.append((file_path_repo, tas_lines_og, tas_file_raw, commit_message))
# don't commit now, since there may be desyncs
else:
if not tas_parsed_new.finaltime_frames:
Expand Down Expand Up @@ -379,7 +378,7 @@ def sync_test(project_id: int, force: bool):

# commit updated fullgame files
for queued_commit in queued_update_commits:
file_path_repo, lines, uses_crlf, commit_message = queued_commit
file_path_repo, lines, raw_file, commit_message = queued_commit
lines_joined = ''.join(lines)
desyncs_found = [d for d in desyncs if d[0][:-4] in lines_joined]

Expand All @@ -389,12 +388,7 @@ def sync_test(project_id: int, force: bool):
continue

log.info(f"Committing updated fullgame file: \"{commit_message}\"")
lines_encoded = lines_joined.encode('UTF8')

if uses_crlf: # if raw uses crlf
log.info("Converted it to CRLF")
lines_encoded = lines_encoded.replace(b'\n', b'\r\n')

lines_encoded = main.convert_line_endings(lines_joined.encode('UTF8'), raw_file)
main.generate_request_headers(project['installation_owner'], 300)
commit_data = {'content': base64.b64encode(lines_encoded).decode('UTF8'),
'sha': main.get_sha(repo, file_path_repo),
Expand Down

0 comments on commit 4a10465

Please sign in to comment.