better json generation

Author: BeubeuCode

CommandHandler.py

@@ -11,7 +11,7 @@ def printHelp():
         exit(0)
 
     @staticmethod
-    def argsHandler(arg1=None, arg2=None):
+    def argsHandler(self, arg1=None, arg2=None, w=None):
         if arg1 is None and arg2 is None:
             self.printHelp()
 

Weapon.py

@@ -42,12 +42,10 @@ def generate(self, weapon_type):
             self.clip_size = random.randint(1, 10)
             self.rarity = random.randint(0, 10)
 
-            
-
     def to_string(self):
         print(self.name + " " + str(self.rarity) + " " + str(self.dmg))
 
-    def generate_json(self, w: Weapon):
+    def generate_json(self, w):
         return json.dumps(w.__dict__)
 
     def create_json_file(self, arg):
@@ -61,6 +59,4 @@ def weapon_generation(self, l, weapon_type):
             w = Weapon()
             list.append(w)
             print(json.dumps(w.__dict__))
-        self.create_json_file(json.dumps([w.__dict__ for list in list]))
-
-    
+        self.create_json_file(json.dumps([w.__dict__ for list in list]))

__pycache__/CommandHandler.cpython-38.pyc

@@ -46,7 +46,7 @@ def assault_rifle_multiple(number):
     return json_type_response(json.dumps([w.__dict__ for weapon_list in weapon_list]))
 
 @app.route('/shotgun/<number>')
-def assault_rifle_multiple(number):
+def shotgun_multiple(number):
     number = int(number)
     weapon_list = []
     for i in range(number):
@@ -56,7 +56,7 @@ def assault_rifle_multiple(number):
     return json_type_response(json.dumps([w.__dict__ for weapon_list in weapon_list]))
 
 @app.route('/sniper_rifle/<number>')
-def assault_rifle_multiple(number):
+def sniper_rifle_multiple(number):
     number = int(number)
     weapon_list = []
     for i in range(number):

__pycache__/Weapon.cpython-38.pyc

@@ -10,17 +10,26 @@ def create_json_file(arg):
 	f.write(arg)
 
 def weapon_generation(l, weapon_type):
-	str_array_json = "["
-	for i in range(l):
+	if l is not int:
+		l = int(l)
+	
+	if l == 1:
 		w = Weapon()
-		w.generate(weapon_type)
-		print(w.generate_json())
-		str_array_json += w.generate_json()
-		if i < l - 1:
-			str_array_json += ","
-	str_array_json += " ]"
-	create_json_file(str_array_json)
-
+		if weapon_type == "ASSAULT_RIFLE" or weapon_type == "SHOTGUN" or weapon_type == "SNIPER_RIFLE":
+			w.generate(weapon_type)
+		else:
+			print("FATAL ERROR")
+			raise ValueError("INVALID WEAPON TYPE")
+			exit(1)
+		w.generate_json(w)
+	else:
+		list = []
+		if weapon_type == "ASSAULT_RIFLE" or weapon_type == "SHOTGUN" or weapon_type == "SNIPER_RIFLE":
+			w.generate(weapon_type)
+		else:
+			print("FATAL ERROR")
+			raise ValueError("INVALID WEAPON TYPE")
+			exit(1)
 def main():
 	start = time.time()