3rd inital version (D:)
This commit is contained in:
parent
4ac7af1097
commit
ee9693b655
1 changed files with 123 additions and 96 deletions
133
Shared/Sync.py
133
Shared/Sync.py
|
@ -37,6 +37,8 @@ def get_name_from_path(path):
|
||||||
def get_file_content(path):
|
def get_file_content(path):
|
||||||
return open(path, "rb+").read()
|
return open(path, "rb+").read()
|
||||||
|
|
||||||
|
def base64_str_decode(path):
|
||||||
|
return base64.b64encode(get_file_content(path)).decode()
|
||||||
|
|
||||||
class ReloadHandler(FileSystemEventHandler):
|
class ReloadHandler(FileSystemEventHandler):
|
||||||
def __init__(self, sync):
|
def __init__(self, sync):
|
||||||
|
@ -65,7 +67,7 @@ class SyncClient(Routing.ClientRoute):
|
||||||
self.route = route
|
self.route = route
|
||||||
self.exclude = exclude
|
self.exclude = exclude
|
||||||
self.files = relative_recursive_ls(folder, folder, exclude=self.exclude)
|
self.files = relative_recursive_ls(folder, folder, exclude=self.exclude)
|
||||||
self.surpressed_fs_events = []
|
self.suppressed_fs_events = []
|
||||||
observer = Observer()
|
observer = Observer()
|
||||||
observer.schedule(ReloadHandler(self), path=self.folder, recursive=True)
|
observer.schedule(ReloadHandler(self), path=self.folder, recursive=True)
|
||||||
observer.start()
|
observer.start()
|
||||||
|
@ -74,8 +76,8 @@ class SyncClient(Routing.ClientRoute):
|
||||||
def start(self):
|
def start(self):
|
||||||
out = {"list" : {}}
|
out = {"list" : {}}
|
||||||
for file in self.files:
|
for file in self.files:
|
||||||
out["list"].update({file : {"mtime" : os.path.getmtime(self.folder + file), "md5" : md5(self.folder + file)}})
|
out["list"].update({file : {"mtime" : os.path.getmtime(self.folder + file),
|
||||||
print(out)
|
"md5" : md5(self.folder + file)}})
|
||||||
self.sock.send(out, self.route)
|
self.sock.send(out, self.route)
|
||||||
self.started = True
|
self.started = True
|
||||||
|
|
||||||
|
@ -83,41 +85,53 @@ class SyncClient(Routing.ClientRoute):
|
||||||
self.started = False
|
self.started = False
|
||||||
|
|
||||||
|
|
||||||
def surpress_fs_event(self, file):
|
def suppress_fs_event(self, file):
|
||||||
if not file in self.surpressed_fs_events:
|
if not file in self.suppressed_fs_events:
|
||||||
self.surpressed_fs_events.append(file)
|
self.suppressed_fs_events.append(file)
|
||||||
|
|
||||||
|
|
||||||
def unsurpess_fs_event(self, file):
|
def unsuppress_fs_event(self, file):
|
||||||
if file in self.surpressed_fs_events:
|
if file in self.suppressed_fs_events:
|
||||||
del self.surpressed_fs_events[self.surpressed_fs_events.index(file)]
|
del self.suppressed_fs_events[self.suppressed_fs_events.index(file)]
|
||||||
|
|
||||||
|
|
||||||
def run(self, data, handler):
|
def run(self, data, handler):
|
||||||
if type(data) is dict:
|
if type(data) is dict:
|
||||||
if "add" in data:
|
if "add" in data:
|
||||||
for file in data["add"]:
|
for file in data["add"]:
|
||||||
self.surpress_fs_event(file)
|
if not file in self.suppressed_fs_events:
|
||||||
open(file, "wb+").write(base64.b64decode(data["add"][file]["content"]))
|
self.suppress_fs_event(file)
|
||||||
os.utime(file, data["add"][file]["mtime"])
|
folder_path = self.folder + os.path.dirname(file)
|
||||||
self.unsupress_fs_event(file)
|
if not os.path.exists(folder_path):
|
||||||
|
os.makedirs(folder_path)
|
||||||
|
if os.path.exists:
|
||||||
|
open(self.folder + file, "wb+").write(base64.b64decode(data["add"][file]["content"]))
|
||||||
|
else:
|
||||||
|
open(self.folder + file, "ab+").write(base64.b64decode(data["add"][file]["content"]))
|
||||||
|
os.utime(self.folder + file, (data["add"][file]["mtime"], data["add"][file]["mtime"]))
|
||||||
|
else:
|
||||||
|
self.unsuppress_fs_event(file)
|
||||||
elif "del" in data:
|
elif "del" in data:
|
||||||
self.surpress_fs_event(file)
|
for file in data["del"]:
|
||||||
os.remove(file)
|
if not file in self.suppressed_fs_events:
|
||||||
self.unsupress_fs_event(file)
|
os.remove(self.folder + file)
|
||||||
|
else:
|
||||||
|
self.unsuppress_fs_event(file)
|
||||||
elif "req" in data:
|
elif "req" in data:
|
||||||
for file in data["req"]:
|
for file in data["req"]:
|
||||||
if file in self.files:
|
if file in self.files:
|
||||||
self.sock.send({"add" : {"content" : base64.b64encode(get_file_content(file)).encode(), "mtime" : os.path.getmtime(file)}}, self.route)
|
self.sock.send({"add" : {file : {"content" : base64_str_decode(self.folder + file),
|
||||||
|
"mtime" : os.path.getmtime(self.folder + file)}}}, self.route)
|
||||||
|
|
||||||
|
|
||||||
def modified(self, event):
|
def modified(self, event):
|
||||||
if self.started:
|
|
||||||
relpath = os.path.relpath(event.src_path, self.folder)
|
relpath = os.path.relpath(event.src_path, self.folder)
|
||||||
if relpath not in self.files:
|
if relpath not in self.files:
|
||||||
self.files.append(relpath)
|
self.files.append(relpath)
|
||||||
if not relpath in self.surpressed_fs_events:
|
self.sock.send({"add" : {relpath : {"content" : base64_str_decode(event.src_path),
|
||||||
self.sock.send({"add" : {"content" : base64.b64encode(get_file_content(event.src_path)).encode(), "mtime" : os.path.getmtime(event.src_path)}}, self.route)
|
"mtime" : os.path.getmtime(event.src_path)}}}, self.route)
|
||||||
|
self.suppress_fs_event(relpath)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def created(self, event):
|
def created(self, event):
|
||||||
|
@ -125,73 +139,86 @@ class SyncClient(Routing.ClientRoute):
|
||||||
|
|
||||||
|
|
||||||
def deleted(self, event):
|
def deleted(self, event):
|
||||||
if self.started:
|
|
||||||
relpath = os.path.relpath(event.src_path, self.folder)
|
relpath = os.path.relpath(event.src_path, self.folder)
|
||||||
if relpath in self.files:
|
if relpath in self.files:
|
||||||
del self.files[self.files.index(relpath)]
|
del self.files[self.files.index(relpath)]
|
||||||
if not relpath in self.surpressed_fs_events:
|
|
||||||
self.sock.send({"del" : [relpath]}, self.route)
|
self.sock.send({"del" : [relpath]}, self.route)
|
||||||
|
self.suppress_fs_event(relpath)
|
||||||
|
|
||||||
|
|
||||||
class SyncServer:
|
class SyncServer(Routing.ServerRoute):
|
||||||
def __init__(self, folder, exclude=[".DS_Store", ".git"]):
|
REQUIRED = (Routing.BROADCAST, Routing.ROUTE)
|
||||||
|
|
||||||
|
def __init__(self, folder, channel, exclude=[".DS_Store", ".git"]):
|
||||||
self.folder = folder if folder[-1] == "/" else folder + "/"
|
self.folder = folder if folder[-1] == "/" else folder + "/"
|
||||||
|
self.channel = channel
|
||||||
self.exclude = exclude
|
self.exclude = exclude
|
||||||
self.files = relative_recursive_ls(folder, folder, exclude=self.exclude)
|
self.suppressed_fs_events = []
|
||||||
self.surpressed_fs_events = []
|
self.route = None # Set by REQUIRED
|
||||||
|
self.broadcast = None # Set by REQUIRED
|
||||||
|
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
self.files = relative_recursive_ls(folder, folder, exclude=self.exclude)
|
self.files = relative_recursive_ls(self.folder, self.folder, exclude=self.exclude)
|
||||||
observer = Observer()
|
observer = Observer()
|
||||||
observer.schedule(ReloadHandler(self), path=self.folder, recursive=True)
|
observer.schedule(ReloadHandler(self), path=self.folder, recursive=True)
|
||||||
observer.start()
|
observer.start()
|
||||||
|
|
||||||
|
|
||||||
def surpress_fs_event(self, file):
|
def suppress_fs_event(self, file):
|
||||||
if not file in self.surpressed_fs_events:
|
if not file in self.suppressed_fs_events:
|
||||||
self.surpressed_fs_events.append(file)
|
self.suppressed_fs_events.append(file)
|
||||||
|
|
||||||
|
|
||||||
def unsurpess_fs_event(self, file):
|
def unsuppress_fs_event(self, file):
|
||||||
if file in self.surpressed_fs_events:
|
if file in self.suppressed_fs_events:
|
||||||
del self.surpressed_fs_events[self.surpressed_fs_events.index(file)]
|
del self.suppressed_fs_events[self.suppressed_fs_events.index(file)]
|
||||||
|
|
||||||
|
|
||||||
def run(self, data, handler):
|
def run(self, data, handler):
|
||||||
if type(data) is dict:
|
if type(data) is dict:
|
||||||
if "list" in data:
|
if "list" in data:
|
||||||
for file in data["list"]:
|
for file in data["list"]:
|
||||||
print(file)
|
if data["list"][file]["mtime"] < handler.last_stop:
|
||||||
if data["list"][file]["mtime"] < handler.last_stop_time:
|
|
||||||
if file in self.files:
|
if file in self.files:
|
||||||
if data["list"][file]["md5"] != md5(file):
|
if data["list"][file]["mtime"] < os.path.getmtime(self.folder + file):
|
||||||
handler.sock.send({"del" : [file]}, handler.get_route(self))
|
handler.sock.send({"add" : {relpath : {
|
||||||
|
"content" : base64_str_decode(event.src_path),
|
||||||
|
"mtime" : os.path.getmtime(event.src_path)}}}, self.route)
|
||||||
|
elif data["list"][file]["mtime"] > os.path.getmtime(self.folder + file):
|
||||||
|
handler.sock.send({"req" : [file]}, self.route)
|
||||||
else:
|
else:
|
||||||
handler.sock.send({"del" : [file]}, handler.get_route(self))
|
handler.sock.send({"del" : [file]}, self.route)
|
||||||
else:
|
else:
|
||||||
handler.sock.send({"req" : [file]}, handler.get_route(self))
|
if file not in self.files:
|
||||||
|
handler.sock.send({"req" : [file]}, self.route)
|
||||||
elif "add" in data:
|
elif "add" in data:
|
||||||
for file in data["add"]:
|
for file in data["add"]:
|
||||||
self.surpress_fs_event(file)
|
if not file in self.suppressed_fs_events:
|
||||||
open(file, "wb+").write(base64.b64decode(data["add"][file]["content"].decode()))
|
self.suppress_fs_event(file)
|
||||||
os.utime(file, data["add"][file]["mtime"])
|
folder_path = self.folder + os.path.dirname(file)
|
||||||
self.unsupress_fs_event(file)
|
if not os.path.exists(folder_path):
|
||||||
|
os.makedirs(folder_path)
|
||||||
|
if os.path.exists:
|
||||||
|
open(self.folder + file, "wb+").write(base64.b64decode(data["add"][file]["content"]))
|
||||||
|
else:
|
||||||
|
open(self.folder + file, "ab+").write(base64.b64decode(data["add"][file]["content"]))
|
||||||
|
os.utime(self.folder + file, (data["add"][file]["mtime"], data["add"][file]["mtime"]))
|
||||||
|
else:
|
||||||
|
self.unsuppress_fs_event(file)
|
||||||
elif "del" in data:
|
elif "del" in data:
|
||||||
self.surpress_fs_event(file)
|
for file in data["del"]:
|
||||||
os.remove(file)
|
os.remove(self.folder + file)
|
||||||
self.unsupress_fs_event(file)
|
|
||||||
|
|
||||||
|
|
||||||
def modified(self, event):
|
def modified(self, event):
|
||||||
relpath = os.path.relpath(event.src_path, self.folder)
|
relpath = os.path.relpath(event.src_path, self.folder)
|
||||||
if relpath not in self.files:
|
if relpath not in self.files:
|
||||||
self.files.append(relpath)
|
self.files.append(relpath)
|
||||||
if not relpath in self.surpressed_fs_events:
|
self.broadcast.broadcast({"add" : {relpath : {
|
||||||
handler.broadcast({"add" : {
|
"content" : base64_str_decode(event.src_path),
|
||||||
"content" : base64.b64encode(get_file_content(event.src_path)).encode(),
|
"mtime" : os.path.getmtime(event.src_path)}}}, self.route, self.channel)
|
||||||
"mtime" : os.path.getmtime(event.src_path)}}, handler.get_route(self), channel)
|
suppress_fs_event(relpath)
|
||||||
|
|
||||||
|
|
||||||
def created(self, event):
|
def created(self, event):
|
||||||
|
@ -202,5 +229,5 @@ class SyncServer:
|
||||||
relpath = os.path.relpath(event.src_path, self.folder)
|
relpath = os.path.relpath(event.src_path, self.folder)
|
||||||
if relpath in self.files:
|
if relpath in self.files:
|
||||||
del self.files[self.files.index(relpath)]
|
del self.files[self.files.index(relpath)]
|
||||||
if not relpath in self.surpressed_fs_events:
|
self.broadcast.broadcast({"del" : [relpath]}, self.route, self.channel)
|
||||||
handler.broadcast({"del" : [relpath]}, handler.get_route(self), channel)
|
self.suppress_fs_event(relpath)
|
Reference in a new issue