reformated code
parent
0e6dde68c6
commit
fa8590e197
|
@ -5,24 +5,20 @@ import json
|
|||
|
||||
from dir_to_json import get_json
|
||||
|
||||
|
||||
def compare_json(json1, json2):
|
||||
bckup1, bckup2 = json1[:], json2[:]
|
||||
items1 = list(enumerate(json1))
|
||||
items2 = list(enumerate(json2))
|
||||
for i, item1 in items1:
|
||||
for j, item2 in items2:
|
||||
if item1["name"] == item2["name"]:
|
||||
if item1["is_file"] == True == item2["is_file"]:
|
||||
if all([item1["is_file"], item2["is_file"]]):
|
||||
if item1["checksum"] == item2["checksum"]:
|
||||
json1[i] = None
|
||||
json2[j] = None
|
||||
'''
|
||||
else:
|
||||
json1[i]["tag"] = "update"
|
||||
json2[j] = None
|
||||
'''
|
||||
elif item1["is_file"] == False == item2["is_file"]:
|
||||
new_json1, new_json2 = compare_json(item1["content"], item2["content"])
|
||||
elif all([not item1["is_file"], not item2["is_file"]]):
|
||||
new_json1, new_json2 = compare_json(
|
||||
item1["content"], item2["content"])
|
||||
if len(new_json1) == 0:
|
||||
json1[i] = None
|
||||
else:
|
||||
|
@ -31,16 +27,16 @@ def compare_json(json1, json2):
|
|||
json2[j] = None
|
||||
else:
|
||||
json2[j]["content"] = new_json2
|
||||
elif item1["is_file"] != item2["is_file"]:##### Caso hipotetico imposible #####
|
||||
json1[i]["tag"] == "delete"
|
||||
json1 = list(filter(None, json1))
|
||||
json2 = list(filter(None, json2))
|
||||
return json1, json2
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
json1 = get_json("/home/kirbylife/Proyectos/munyal_test/original")
|
||||
json2 = get_json("/home/kirbylife/Proyectos/munyal_test/copy")
|
||||
except:
|
||||
except Exception:
|
||||
print("error outside")
|
||||
json1, json2 = compare_json(json1, json2)
|
||||
#print(len(json1), len(json2))
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from hashlib import md5
|
||||
|
||||
import os
|
||||
import json
|
||||
import os
|
||||
from hashlib import md5
|
||||
|
||||
|
||||
def md5sum(filename):
|
||||
|
@ -14,18 +13,17 @@ def md5sum(filename):
|
|||
for chunk in iter(lambda: f.read(128 * hash.block_size), b""):
|
||||
hash.update(chunk)
|
||||
return hash.hexdigest()
|
||||
except:
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def get_json(path):
|
||||
out = []
|
||||
items = os.listdir(path)
|
||||
try:
|
||||
for item in items:
|
||||
if item[0] != ".":
|
||||
item_json = {
|
||||
"name": item
|
||||
}
|
||||
item_json = {"name": item}
|
||||
route = os.path.join(path, item)
|
||||
if os.path.isdir(route):
|
||||
item_json["is_file"] = False
|
||||
|
@ -40,11 +38,15 @@ def get_json(path):
|
|||
item_json["checksum"] = checksum
|
||||
else:
|
||||
item = None
|
||||
else:
|
||||
continue
|
||||
out.append(item_json)
|
||||
except:
|
||||
except Exception:
|
||||
return get_json(path)
|
||||
return out
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
output = get_json("/media/kirbylife/DATOS/Proyectos/PyCharmProjects/Munyal/folder_test")
|
||||
output = get_json(
|
||||
"/media/kirbylife/DATOS/Proyectos/PyCharmProjects/Munyal/folder_test")
|
||||
print(json.dumps(output, indent=4))
|
||||
|
|
Loading…
Reference in New Issue