dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepend lists when merging event objects

Browse Source
This commit is contained in:
Ruud
2013-03-20 22:45:31 +01:00
parent 717b88b5fe
commit 2c64641a1b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/event.py
+1 -1
View File
@@ -110,7 +110,7 @@ def fireEvent(name, *args, **kwargs):
if isinstance(results[0], dict): if isinstance(results[0], dict):
merged = {} merged = {}
for result in results: for result in results:
merged = mergeDicts(merged, result) merged = mergeDicts(merged, result, prepend_list = True)
results = merged results = merged
# Lists # Lists
couchpotato/core/helpers/variable.py
+2 -2
View File
@@ -53,7 +53,7 @@ def getDataDir():
def isDict(object): def isDict(object):
return isinstance(object, dict) return isinstance(object, dict)
def mergeDicts(a, b): def mergeDicts(a, b, prepend_list = False):
assert isDict(a), isDict(b) assert isDict(a), isDict(b)
dst = a.copy() dst = a.copy()
@@ -67,7 +67,7 @@ def mergeDicts(a, b):
if isDict(current_src[key]) and isDict(current_dst[key]): if isDict(current_src[key]) and isDict(current_dst[key]):
stack.append((current_dst[key], current_src[key])) stack.append((current_dst[key], current_src[key]))
elif isinstance(current_src[key], list) and isinstance(current_dst[key], list): elif isinstance(current_src[key], list) and isinstance(current_dst[key], list):
current_dst[key].extend(current_src[key]) current_dst[key] = current_src[key] + current_dst[key] if prepend_list else current_dst[key] + current_src[key]
current_dst[key] = removeListDuplicates(current_dst[key]) current_dst[key] = removeListDuplicates(current_dst[key])
else: else:
current_dst[key] = current_src[key] current_dst[key] = current_src[key]