Merge branch 'main' of https://gitea.tendokyu.moe/pinapelz/more-tachi-import-scripts

2 files changed, 10 insertions, 7 deletions

diff --git a/jubeat/asphyxia/README.md b/jubeat/asphyxia/README.md
index c26729b..8b8db54 100644
--- a/jubeat/asphyxia/README.md
+++ b/jubeat/asphyxia/README.md
@@ -2,7 +2,9 @@
 
 **MUSIC_BAR IS NOT SAVED, SOME CASES MAY BE INCORRECT, USE WITH CAUTION**
 
-[Plugin Repo](github.com/yuanqiuye/asphyxia-jubeat-CZEAve-plugins)
+[Plugin Repo](https://github.com/yuanqiuye/asphyxia-jubeat-CZEAve-plugins)
 The official Asphyxia Plugin (up to Festo) also stores data in the same format so it will work.
 
-Pass in your `jubeat@asphyxia.db` as `-f` or `--file`
\ No newline at end of file
+Pass in your `jubeat@asphyxia.db` as `-f` or `--file`, this can be found in the `savedata` folder of wherever your Asphyxia executable is.
+
+Your Profile ID can be found by going to  `Asphyxia WebUI -> Profile` and copy the ID there for the appropriate profile
diff --git a/jubeat/asphyxia/czeave_to_tachi.py b/jubeat/asphyxia/czeave_to_tachi.py
index e486351..9038b24 100644
--- a/jubeat/asphyxia/czeave_to_tachi.py
+++ b/jubeat/asphyxia/czeave_to_tachi.py
@@ -13,13 +13,13 @@ SEQUENCE_MAP = {
     2: "EXT"
 }
 
-def convert_from_czeave_json_to_tachi_json(file: str, output_path: str, service: str):
+def convert_from_czeave_json_to_tachi_json(file: str, output_path: str, service: str, profile_id: str):
     with open(file, "r", encoding="utf-8") as infile:
         batch_manual = {
             "meta": {"game": "jubeat", "playtype": "Single", "service": service},
         }
         scores = []
-        data = [json.loads(line) for line in infile if '"collection":"score"' in line]
+        data = [json.loads(line) for line in infile if '"collection":"score"' in line and profile_id in line]
         for score in data:
             difficulty = SEQUENCE_MAP[score["seq"]]
             if score["isHardMode"]:
@@ -59,12 +59,13 @@ if __name__ == "__main__":
         "-s",
         "--service",
         help="Service description to be shown on Tachi (Note for where this score came from)",
-        default="jubeat Asphyxia czeave",
+        default="jubeat Asphyxia CZEAve",
     )
-    parser.add_argument("-f", "--file", help="AsphyxiaCORE jubeat .db file czeave", required=True)
+    parser.add_argument("-f", "--file", help="AsphyxiaCORE jubeat .db file (jubeat@asphyxia.db)", required=True)
     parser.add_argument(
         "-o", "--output", help="Output filename", default="czeave_asphyxia_batch_manual.json"
     )
+    parser.add_argument("-p", "--profile", help="Asphyxia Profile ID to export for", required=True)
     args = parser.parse_args()
     if args.file is None:
         print("ERROR: Please specify Asphyxia DB file (from savedata folder)")
@@ -73,4 +74,4 @@ if __name__ == "__main__":
         print(f"ERROR: The file {args.file} does not exist.")
         exit(1)
 
-    convert_from_czeave_json_to_tachi_json(args.file, args.output, args.service)
+    convert_from_czeave_json_to_tachi_json(args.file, args.output, args.service, args.profile)