json-duplicate-keys 2024.11.19__py2-none-any.whl → 2024.11.28__py2-none-any.whl

json_duplicate_keys/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 try:
 	unicode # Python 2
 except NameError:
@@ -150,9 +151,8 @@ def loads(Jstr, dupSign_start="{{{", dupSign_end="}}}", ordered_dict=False, _isD
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 def load(Jfilepath, dupSign_start="{{{", dupSign_end="}}}", ordered_dict=False, _isDebug_=False):
 	try:
-		Jfile = open(Jfilepath)
-		Jstr = Jfile.read()
-		Jfile.close()
+		with open(Jfilepath) as Jfile:
+			Jstr = Jfile.read()
 
 		return loads(Jstr, dupSign_start=dupSign_start, dupSign_end=dupSign_end, ordered_dict=ordered_dict, _isDebug_=_isDebug_)
 	except Exception as e:
@@ -307,16 +307,20 @@ class JSON_DUPLICATE_KEYS:
 			else:
 				if self.get(separator.join(name.split(separator)[:-1]), case_insensitive=case_insensitive, separator=separator, parse_index=parse_index)["value"] != "JSON_DUPLICATE_KEYS_ERROR":
 					Jget = self.get(separator.join(name.split(separator)[:-1]), case_insensitive=case_insensitive, separator=separator, parse_index=parse_index)
-					exec_expression = "self.getObject()"
+					if type(Jget["value"]) in [dict, OrderedDict]:
+						exec_expression = "self.getObject()"
 
-					for k in Jget["name"].split(separator):
-						if re.search("^"+re.escape(parse_index)+"\\d+"+re.escape(parse_index)+"$", k):
-							exec_expression += "["+k.split(parse_index)[1]+"]"
-						else:
-							exec_expression += "["+repr(k)+"]"
+						for k in Jget["name"].split(separator)+[name.split(separator)[-1]]:
+							if re.search("^"+re.escape(parse_index)+"\\d+"+re.escape(parse_index)+"$", k):
+								exec_expression += "["+k.split(parse_index)[1]+"]"
+							else:
+								exec_expression += "["+repr(k)+"]"
 
-					exec(exec_expression+"="+repr(value))
-					return True
+						exec(exec_expression+"="+repr(value))
+						return True
+					else:
+						if _isDebug_: print("\x1b[31m[-] KeyNameInvalidError: \x1b[0m"+name)
+						return False
 				else:
 					if _isDebug_: print("\x1b[31m[-] KeyNameNotExistError: {}\x1b[0m".format(separator.join(Jget["name"].split(separator)[:-1])))
 					return False
@@ -328,7 +332,7 @@ class JSON_DUPLICATE_KEYS:
 	# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 	# # # # # # # # # # # # # # update # # # # # # # # # # # # # #
 	# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-	def update(self, name, value, case_insensitive=False, separator="||", parse_index="$", _isDebug_=False):
+	def update(self, name, value, case_insensitive=False, allow_new_key=False, separator="||", parse_index="$", dupSign_start="{{{", dupSign_end="}}}", ordered_dict=False, _isDebug_=False):
 		import re
 
 		# User input data type validation
@@ -344,7 +348,10 @@ class JSON_DUPLICATE_KEYS:
 
 		if type(parse_index) not in [str, unicode]: parse_index = "$"
 
-		if self.get(name, case_insensitive=case_insensitive, separator=separator, parse_index=parse_index, _isDebug_=_isDebug_)["value"] != "JSON_DUPLICATE_KEYS_ERROR":
+		_debug_ = _isDebug_
+		if allow_new_key: _debug_ = False
+
+		if self.get(name, case_insensitive=case_insensitive, separator=separator, parse_index=parse_index, _isDebug_=_debug_)["value"] != "JSON_DUPLICATE_KEYS_ERROR":
 			Jname = self.get(name, case_insensitive=case_insensitive, separator=separator, parse_index=parse_index)["name"]
 			try:
 				exec_expression = "self.getObject()"
@@ -359,6 +366,8 @@ class JSON_DUPLICATE_KEYS:
 				return True
 			except Exception as e:
 				if _isDebug_: print("\x1b[31m[-] ExceptionError: {}\x1b[0m".format(e))
+		elif allow_new_key:
+			return self.set(name, value, case_insensitive=case_insensitive, separator=separator, parse_index=parse_index, dupSign_start=dupSign_start, dupSign_end=dupSign_end, ordered_dict=ordered_dict, _isDebug_=_isDebug_)
 
 		return False
 	# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -420,10 +429,10 @@ class JSON_DUPLICATE_KEYS:
 		for k, v in JDKSObject.getObject().items():
 			if type(k) == str and type(name) == str:
 				if re.search(name, k):
-					newJDKSObject.set(k, v, separator="!!"+separator+"!!", parse_index="!!"+parse_index+"!!", ordered_dict=ordered_dict)
+					newJDKSObject.set(k, v, separator="§§"+separator+"§§", parse_index="§§"+parse_index+"§§", ordered_dict=ordered_dict)
 			else:
 				if name == k:
-					newJDKSObject.set(k, v, separator="!!"+separator+"!!", parse_index="!!"+parse_index+"!!", ordered_dict=ordered_dict)
+					newJDKSObject.set(k, v, separator="§§"+separator+"§§", parse_index="§§"+parse_index+"§§", ordered_dict=ordered_dict)
 
 		return newJDKSObject
 	# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -444,10 +453,10 @@ class JSON_DUPLICATE_KEYS:
 		for k, v in JDKSObject.getObject().items():
 			if type(v) == str and type(value) == str:
 				if re.search(value, v):
-					newJDKSObject.set(k, v, separator="!!"+separator+"!!", parse_index="!!"+parse_index+"!!", ordered_dict=ordered_dict)
+					newJDKSObject.set(k, v, separator="§§"+separator+"§§", parse_index="§§"+parse_index+"§§", ordered_dict=ordered_dict)
 			else:
 				if value == v:
-					newJDKSObject.set(k, v, separator="!!"+separator+"!!", parse_index="!!"+parse_index+"!!", ordered_dict=ordered_dict)
+					newJDKSObject.set(k, v, separator="§§"+separator+"§§", parse_index="§§"+parse_index+"§§", ordered_dict=ordered_dict)
 
 		return newJDKSObject
 	# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

{json_duplicate_keys-2024.11.19.dist-info → json_duplicate_keys-2024.11.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json-duplicate-keys
-Version: 2024.11.19
+Version: 2024.11.28
 Summary: Flatten/ Unflatten and Load(s)/ Dump(s) JSON File/ Object with Duplicate Keys
 Home-page: https://github.com/truocphan/json-duplicate-keys
 Author: TP Cyber Security
@@ -197,13 +197,17 @@ print(JDKSObject.getObject())
 ```
 ---
 
-### JSON_DUPLICATE_KEYS.update(`name`, `value`, `case_insensitive`=False, `separator`="||", `parse_index`="$", `_isDebug_`=False)
-_Update new `value` for existing `name` in the JSON object_
+### JSON_DUPLICATE_KEYS.update(`name`, `value`, `case_insensitive`=False, `allow_new_key`=False, `separator`="||", `parse_index`="$", `dupSign_start`="{{{", `dupSign_end`="}}}", `ordered_dict`=False, `_isDebug_`=False)
+_Update new `value` for existing `name` or Set a new `name` in the JSON object_
 - `name`: the key name of the JSON object. Supported flatten key name format
 - `value`: new value for key `name`
 - `case_insensitive`: the key name case (in)sensitive
+- `allow_new_key`: allows to create a new key name if the key name does not exist
 - `separator`: 
 - `parse_index`: 
+- `dupSign_start`: 
+- `dupSign_end`: 
+- `ordered_dict`: preserves the order in which the Keys are inserted
 - `_isDebug_`: Show/ Hide debug error messages
 ```python
 import json_duplicate_keys as jdks
@@ -254,7 +258,7 @@ print(JDKSObject.getObject())
 - `name`:
 - `separator`:
 - `parse_index`:
-- `ordered_dict`:
+- `ordered_dict`: preserves the order in which the Keys are inserted
 ```python
 import json_duplicate_keys as jdks
 
@@ -275,7 +279,7 @@ print(JDKSObject.dumps())
 - `value`:
 - `separator`:
 - `parse_index`:
-- `ordered_dict`:
+- `ordered_dict`: preserves the order in which the Keys are inserted
 ```python
 import json_duplicate_keys as jdks
 
@@ -393,6 +397,9 @@ print(JDKSObject.getObject())
 ---
 
 ## CHANGELOG
+#### [json-duplicate-keys v2024.11.28](https://github.com/truocphan/json-duplicate-keys/tree/2024.11.28)
+- **Fixed**: Add subkey name to empty dict of existing key name
+
 #### [json-duplicate-keys v2024.11.19](https://github.com/truocphan/json-duplicate-keys/tree/2024.11.19)
 - **Updated**: Allows getting (`JSON_DUPLICATE_KEYS.get`), setting (`JSON_DUPLICATE_KEYS.set`), updating (`JSON_DUPLICATE_KEYS.update`), deleting (`JSON_DUPLICATE_KEYS.delete`) JSON_DUPLICATE_KEYS objects with case-insensitive key names
 

json_duplicate_keys-2024.11.28.dist-info/RECORD

@@ -0,0 +1,6 @@
+json_duplicate_keys/__init__.py,SHA256=YV3PpNeXAynBoY46yTs_M3t3KivpXvOLdeMD__IyviM,27170
+json_duplicate_keys-2024.11.28.dist-info/LICENSE,SHA256=_hudSGMciUc27wGR8EMKfeb3atJRlf6rbhJtLnel-nc,1093
+json_duplicate_keys-2024.11.28.dist-info/METADATA,SHA256=YsVbH-oTT_YslwHqdluw1470mrSvgg4iO50cNcKHPdk,18243
+json_duplicate_keys-2024.11.28.dist-info/WHEEL,SHA256=1VPi6hfNQaRRNuEdK_3dv9o8COtLGnHWJghhj4CQ28k,92
+json_duplicate_keys-2024.11.28.dist-info/top_level.txt,SHA256=vdsGrPLVS_l-BFL1i4hCJBY5_-gq4Cwp-11yegA750Y,20
+json_duplicate_keys-2024.11.28.dist-info/RECORD,,

json_duplicate_keys-2024.11.19.dist-info/RECORD

@@ -1,6 +0,0 @@
-json_duplicate_keys/__init__.py,SHA256=K9bg6uSaRnP4JNorn0Y_Chw_ZnRIZoIU0RGxqHFk8-s,26545
-json_duplicate_keys-2024.11.19.dist-info/LICENSE,SHA256=_hudSGMciUc27wGR8EMKfeb3atJRlf6rbhJtLnel-nc,1093
-json_duplicate_keys-2024.11.19.dist-info/METADATA,SHA256=ytf0YHsh6CsnhIZdaihik1ibZkabt6J1QsHkhbpAlno,17673
-json_duplicate_keys-2024.11.19.dist-info/WHEEL,SHA256=1VPi6hfNQaRRNuEdK_3dv9o8COtLGnHWJghhj4CQ28k,92
-json_duplicate_keys-2024.11.19.dist-info/top_level.txt,SHA256=vdsGrPLVS_l-BFL1i4hCJBY5_-gq4Cwp-11yegA750Y,20
-json_duplicate_keys-2024.11.19.dist-info/RECORD,,