leo60228/cutthecord
1
0
Fork 0
forked from distok/cutthecord
Code Issues Pull requests Projects Releases Wiki Activity

Improve patchport

Browse source 
This changes the syntax of it, so please keep that in mind.
This commit is contained in:
ave 2019-05-18 09:54:20 +03:00
parent 92987f5017
commit be345da97e
No known key found for this signature in database
GPG key ID: 09356ABAA42C842B
3 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -57,6 +57,6 @@ To get the diff, run `diff -crB -x "dist" -x "res/raw" -x "build" CleanFolder Pa
You can use `patchport.py` to easily attempt to port patches.
It's not really intelligent and doesn't do much more than just checking if an existing patch can be applied to a given version (it also replaces relevant variables required for porting various patches), but it saves a lot of time if used carefully.
It's not really intelligent and doesn't do much more than manually preparing necessary patch, checking if an existing patch can be applied to a given version, replacing relevant variables required for porting various patches and eliminating offsets caused by updates, but it saves a lot of time if used carefully.
Example command: `python3 patchport.py 839 8.3.9g /home/ave/Downloads/dic/com.discord-841 /home/ave/Projects/cutthecord/`
Example command: `python3 patchport.py /home/ave/Downloads/dic/com.discord-841`

1
patchport-state.json Normal file
View file

@ -0,0 +1 @@
{"versioncode": "899", "versionname": "8.9.9"}

24
patchport.py
View file

@ -2,17 +2,21 @@
import re
import sys
import os
import json
import subprocess
import datetime
import shutil
# Example invocation:
# python3 patchport.py 839 8.3.9g /home/ave/apks/com.discord-841/ /home/ave/cutthecordrepo/
# python3 patchport.py /home/ave/apks/com.discord-900/
from_versioncode = sys.argv[1]
from_versionname = sys.argv[2]
apk_folder = sys.argv[3]
cutthecord_folder = sys.argv[4]
with open("patchport-state.json", "r") as f:
jin = json.load(f)
from_versioncode = jin["versioncode"]
from_versionname = jin["versionname"]
apk_folder = sys.argv[1]
cutthecord_folder = os.path.dirname(os.path.realpath(__file__))
debug = False
tmp_folder = "/tmp/patchport"
@ -167,9 +171,6 @@ for patch in os.listdir(os.path.join(cutthecord_folder, "patches")):
if not out_path.endswith("-failed"):
print(f"PORTED: {patch} was successfully ported.")
if failures:
print(f"Port complete. Following patches failed: {', '.join(failures)}")
else:
ctcreadme_path = os.path.join(cutthecord_folder, "README.md")
# TODO: can we pull the correct date from distok?
out_datestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d")
@ -183,4 +184,11 @@ else:
with open(ctcreadme_path, "w") as f:
f.write(ctcr_text)
with open("patchport-state.json", "w") as f:
jout = {"versionname": to_versionname, "versioncode": to_versioncode}
json.dump(jout, f)
if failures:
print(f"Port complete. Following patches failed: {', '.join(failures)}")
else:
print("Port complete. All patches completed successfully.")