From 1237737839639b1b1619b61414e67d10a172ad11 Mon Sep 17 00:00:00 2001 From: Reggie Torres Date: Thu, 25 Jan 2024 14:50:38 -0500 Subject: [PATCH 1/5] Add Contribution Tutorial --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db8db57 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +qrcodes/ +__pycache__ +secret_key.txt +ssl_cert.pem +ssl_key.key \ No newline at end of file From a90532bbb36b7272975d33bd5e455f14f838d860 Mon Sep 17 00:00:00 2001 From: Reggie Torres Date: Tue, 5 Mar 2024 12:44:27 -0500 Subject: [PATCH 2/5] Fix Samedec Check (very dumb fix someone edit it later) --- asmara.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/asmara.py b/asmara.py index f5d8f8b..781bfca 100644 --- a/asmara.py +++ b/asmara.py @@ -243,21 +243,13 @@ def __decoder__(self): sev=severity.trace, ) try: - if not ( - "samedec 0.1." + if ( + "samedec 0.2." or "samedec 0.3." or "samedec 0.4." in Popen(["samedec", "-V"], stdout=PIPE) .communicate()[0] .decode("UTF-8") .strip() ): - utilities.autoPrint( - text=f"SAMEDEC is not version 0.2 or higher! Recommended version is 0.2.3.", - classType="DECODER", - sev=severity.fatal, - ) - AS_MAN.killAsmara() - exit(1) - else: self.__decode__ = Popen( ["samedec", "-r", "24000"], stdout=PIPE, @@ -265,6 +257,15 @@ def __decoder__(self): stderr=PIPE, bufsize=1, ) + else: + utilities.autoPrint( + text=f"SAMEDEC is not version 0.2 or higher! Recommended version is 0.2.3.", + classType="DECODER", + sev=severity.fatal, + ) + AS_MAN.killAsmara() + exit(1) + except FileNotFoundError: utilities.autoPrint( text=f"Samedec is not installed on the computer. Please install SAMEDEC 0.2.3 or higher.", From d089cb5f6681bd734ea237398c6439114b2e33ea Mon Sep 17 00:00:00 2001 From: Reggie Torres Date: Tue, 5 Mar 2024 12:54:07 -0500 Subject: [PATCH 3/5] fix the fatal mistake called a string is always true --- asmara.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/asmara.py b/asmara.py index 781bfca..0d1fe47 100644 --- a/asmara.py +++ b/asmara.py @@ -243,13 +243,7 @@ def __decoder__(self): sev=severity.trace, ) try: - if ( - "samedec 0.2." or "samedec 0.3." or "samedec 0.4." - in Popen(["samedec", "-V"], stdout=PIPE) - .communicate()[0] - .decode("UTF-8") - .strip() - ): + if any(version in Popen(["samedec", "-V"], stdout=PIPE).communicate()[0].decode("UTF-8").strip() for version in ["samedec 0.2.", "samedec 0.3.", "samedec 0.4."]): self.__decode__ = Popen( ["samedec", "-r", "24000"], stdout=PIPE, From 170f0081ca081d95cc18544a9f6fdf87ab50c36d Mon Sep 17 00:00:00 2001 From: Reggie Torres Date: Tue, 5 Mar 2024 12:54:24 -0500 Subject: [PATCH 4/5] gitignore update --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index db8db57..b615254 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ qrcodes/ __pycache__ secret_key.txt ssl_cert.pem -ssl_key.key \ No newline at end of file +ssl_key.key +.log +.config \ No newline at end of file From 8fd410a7a6d062a73fe0bade03ba2d921c89fd0f Mon Sep 17 00:00:00 2001 From: Reggie Torres Date: Tue, 5 Mar 2024 12:58:41 -0500 Subject: [PATCH 5/5] make it less dumb --- asmara.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/asmara.py b/asmara.py index 0d1fe47..beba5e0 100644 --- a/asmara.py +++ b/asmara.py @@ -243,7 +243,8 @@ def __decoder__(self): sev=severity.trace, ) try: - if any(version in Popen(["samedec", "-V"], stdout=PIPE).communicate()[0].decode("UTF-8").strip() for version in ["samedec 0.2.", "samedec 0.3.", "samedec 0.4."]): + samedec_version = Popen(["samedec", "-V"], stdout=PIPE).communicate()[0].decode("UTF-8").strip() + if not samedec_version.startswith("samedec 0.1."): self.__decode__ = Popen( ["samedec", "-r", "24000"], stdout=PIPE, @@ -259,7 +260,6 @@ def __decoder__(self): ) AS_MAN.killAsmara() exit(1) - except FileNotFoundError: utilities.autoPrint( text=f"Samedec is not installed on the computer. Please install SAMEDEC 0.2.3 or higher.",