1995-04-10 08:40:52 -03:00
|
|
|
"""Compare local and remote dictionaries and transfer differing files -- like rdist."""
|
|
|
|
|
|
|
|
import sys
|
2008-05-16 04:12:44 -03:00
|
|
|
from reprlib import repr
|
1995-04-10 08:40:52 -03:00
|
|
|
import FSProxy
|
|
|
|
import time
|
|
|
|
import os
|
|
|
|
|
2006-03-17 02:49:51 -04:00
|
|
|
def raw_input(prompt):
|
|
|
|
sys.stdout.write(prompt)
|
|
|
|
sys.stdout.flush()
|
|
|
|
return sys.stdin.readline()
|
|
|
|
|
1995-04-10 08:40:52 -03:00
|
|
|
def main():
|
2004-07-18 02:56:09 -03:00
|
|
|
pwd = os.getcwd()
|
2007-07-17 17:59:35 -03:00
|
|
|
s = input("chdir [%s] " % pwd)
|
2004-07-18 02:56:09 -03:00
|
|
|
if s:
|
|
|
|
os.chdir(s)
|
|
|
|
pwd = os.getcwd()
|
|
|
|
host = ask("host", 'voorn.cwi.nl')
|
|
|
|
port = 4127
|
|
|
|
verbose = 1
|
|
|
|
mode = ''
|
2007-07-17 17:59:35 -03:00
|
|
|
print("""\
|
1995-04-10 08:40:52 -03:00
|
|
|
Mode should be a string of characters, indicating what to do with differences.
|
|
|
|
r - read different files to local file system
|
|
|
|
w - write different files to remote file system
|
|
|
|
c - create new files, either remote or local
|
|
|
|
d - delete disappearing files, either remote or local
|
2007-07-17 17:59:35 -03:00
|
|
|
""")
|
|
|
|
s = input("mode [%s] " % mode)
|
2004-07-18 02:56:09 -03:00
|
|
|
if s: mode = s
|
|
|
|
address = (host, port)
|
|
|
|
t1 = time.time()
|
|
|
|
local = FSProxy.FSProxyLocal()
|
|
|
|
remote = FSProxy.FSProxyClient(address, verbose)
|
|
|
|
compare(local, remote, mode)
|
|
|
|
remote._close()
|
|
|
|
local._close()
|
|
|
|
t2 = time.time()
|
|
|
|
dt = t2-t1
|
|
|
|
mins, secs = divmod(dt, 60)
|
2007-07-17 17:59:35 -03:00
|
|
|
print(mins, "minutes and", round(secs), "seconds")
|
|
|
|
input("[Return to exit] ")
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
def ask(prompt, default):
|
2007-07-17 17:59:35 -03:00
|
|
|
s = input("%s [%s] " % (prompt, default))
|
2004-07-18 02:56:09 -03:00
|
|
|
return s or default
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
def askint(prompt, default):
|
2007-07-17 17:59:35 -03:00
|
|
|
s = input("%s [%s] " % (prompt, str(default)))
|
2004-07-18 02:56:09 -03:00
|
|
|
if s: return string.atoi(s)
|
|
|
|
return default
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
def compare(local, remote, mode):
|
2007-07-17 17:59:35 -03:00
|
|
|
print()
|
|
|
|
print("PWD =", repr(os.getcwd()))
|
2004-07-18 02:56:09 -03:00
|
|
|
sums_id = remote._send('sumlist')
|
|
|
|
subdirs_id = remote._send('listsubdirs')
|
|
|
|
remote._flush()
|
2007-07-17 17:59:35 -03:00
|
|
|
print("calculating local sums ...")
|
2004-07-18 02:56:09 -03:00
|
|
|
lsumdict = {}
|
|
|
|
for name, info in local.sumlist():
|
|
|
|
lsumdict[name] = info
|
2007-07-17 17:59:35 -03:00
|
|
|
print("getting remote sums ...")
|
2004-07-18 02:56:09 -03:00
|
|
|
sums = remote._recv(sums_id)
|
2007-07-17 17:59:35 -03:00
|
|
|
print("got", len(sums))
|
2004-07-18 02:56:09 -03:00
|
|
|
rsumdict = {}
|
|
|
|
for name, rsum in sums:
|
|
|
|
rsumdict[name] = rsum
|
2007-07-17 17:59:35 -03:00
|
|
|
if name not in lsumdict:
|
|
|
|
print(repr(name), "only remote")
|
2004-07-18 02:56:09 -03:00
|
|
|
if 'r' in mode and 'c' in mode:
|
|
|
|
recvfile(local, remote, name)
|
|
|
|
else:
|
|
|
|
lsum = lsumdict[name]
|
|
|
|
if lsum != rsum:
|
2007-07-17 17:59:35 -03:00
|
|
|
print(repr(name), end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
rmtime = remote.mtime(name)
|
|
|
|
lmtime = local.mtime(name)
|
|
|
|
if rmtime > lmtime:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("remote newer", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
if 'r' in mode:
|
|
|
|
recvfile(local, remote, name)
|
|
|
|
elif lmtime > rmtime:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("local newer", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
if 'w' in mode:
|
|
|
|
sendfile(local, remote, name)
|
|
|
|
else:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("same mtime but different sum?!?!", end=' ')
|
|
|
|
print()
|
2007-08-06 18:07:53 -03:00
|
|
|
for name in lsumdict.keys():
|
2007-07-17 17:59:35 -03:00
|
|
|
if not list(rsumdict.keys()):
|
|
|
|
print(repr(name), "only locally", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
fl()
|
|
|
|
if 'w' in mode and 'c' in mode:
|
|
|
|
sendfile(local, remote, name)
|
|
|
|
elif 'r' in mode and 'd' in mode:
|
|
|
|
os.unlink(name)
|
2007-07-17 17:59:35 -03:00
|
|
|
print("removed.")
|
|
|
|
print()
|
|
|
|
print("gettin subdirs ...")
|
2004-07-18 02:56:09 -03:00
|
|
|
subdirs = remote._recv(subdirs_id)
|
|
|
|
common = []
|
|
|
|
for name in subdirs:
|
|
|
|
if local.isdir(name):
|
2007-07-17 17:59:35 -03:00
|
|
|
print("Common subdirectory", repr(name))
|
2004-07-18 02:56:09 -03:00
|
|
|
common.append(name)
|
|
|
|
else:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("Remote subdirectory", repr(name), "not found locally")
|
2004-07-18 02:56:09 -03:00
|
|
|
if 'r' in mode and 'c' in mode:
|
|
|
|
pr = "Create local subdirectory %s? [y] " % \
|
|
|
|
repr(name)
|
|
|
|
if 'y' in mode:
|
|
|
|
ok = 'y'
|
|
|
|
else:
|
|
|
|
ok = ask(pr, "y")
|
|
|
|
if ok[:1] in ('y', 'Y'):
|
|
|
|
local.mkdir(name)
|
2007-07-17 17:59:35 -03:00
|
|
|
print("Subdirectory %s made" % \
|
|
|
|
repr(name))
|
2004-07-18 02:56:09 -03:00
|
|
|
common.append(name)
|
|
|
|
lsubdirs = local.listsubdirs()
|
|
|
|
for name in lsubdirs:
|
|
|
|
if name not in subdirs:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("Local subdirectory", repr(name), "not found remotely")
|
2004-07-18 02:56:09 -03:00
|
|
|
for name in common:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("Entering subdirectory", repr(name))
|
2004-07-18 02:56:09 -03:00
|
|
|
local.cd(name)
|
|
|
|
remote.cd(name)
|
|
|
|
compare(local, remote, mode)
|
|
|
|
remote.back()
|
|
|
|
local.back()
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
def sendfile(local, remote, name):
|
2004-07-18 02:56:09 -03:00
|
|
|
try:
|
|
|
|
remote.create(name)
|
2007-01-10 12:19:56 -04:00
|
|
|
except (IOError, os.error) as msg:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("cannot create:", msg)
|
2004-07-18 02:56:09 -03:00
|
|
|
return
|
|
|
|
|
2007-07-17 17:59:35 -03:00
|
|
|
print("sending ...", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
fl()
|
|
|
|
|
|
|
|
data = open(name).read()
|
|
|
|
|
|
|
|
t1 = time.time()
|
|
|
|
|
|
|
|
remote._send_noreply('write', name, data)
|
|
|
|
remote._flush()
|
|
|
|
|
|
|
|
t2 = time.time()
|
|
|
|
|
|
|
|
dt = t2-t1
|
2007-07-17 17:59:35 -03:00
|
|
|
print(len(data), "bytes in", round(dt), "seconds", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
if dt:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("i.e.", round(len(data)/dt), "bytes/sec", end=' ')
|
|
|
|
print()
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
def recvfile(local, remote, name):
|
2004-07-18 02:56:09 -03:00
|
|
|
ok = 0
|
|
|
|
try:
|
|
|
|
rv = recvfile_real(local, remote, name)
|
|
|
|
ok = 1
|
|
|
|
return rv
|
|
|
|
finally:
|
|
|
|
if not ok:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("*** recvfile of %r failed, deleting" % (name,))
|
2004-07-18 02:56:09 -03:00
|
|
|
local.delete(name)
|
1995-04-26 19:57:12 -03:00
|
|
|
|
|
|
|
def recvfile_real(local, remote, name):
|
2004-07-18 02:56:09 -03:00
|
|
|
try:
|
|
|
|
local.create(name)
|
2007-01-10 12:19:56 -04:00
|
|
|
except (IOError, os.error) as msg:
|
2007-07-17 17:59:35 -03:00
|
|
|
print("cannot create:", msg)
|
2004-07-18 02:56:09 -03:00
|
|
|
return
|
|
|
|
|
2007-07-17 17:59:35 -03:00
|
|
|
print("receiving ...", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
fl()
|
|
|
|
|
|
|
|
f = open(name, 'w')
|
|
|
|
t1 = time.time()
|
|
|
|
|
|
|
|
length = 4*1024
|
|
|
|
offset = 0
|
|
|
|
id = remote._send('read', name, offset, length)
|
|
|
|
remote._flush()
|
|
|
|
while 1:
|
|
|
|
newoffset = offset + length
|
|
|
|
newid = remote._send('read', name, newoffset, length)
|
|
|
|
data = remote._recv(id)
|
|
|
|
id = newid
|
|
|
|
if not data: break
|
|
|
|
f.seek(offset)
|
|
|
|
f.write(data)
|
|
|
|
offset = newoffset
|
|
|
|
size = f.tell()
|
|
|
|
|
|
|
|
t2 = time.time()
|
|
|
|
f.close()
|
|
|
|
|
|
|
|
dt = t2-t1
|
2007-07-17 17:59:35 -03:00
|
|
|
print(size, "bytes in", round(dt), "seconds", end=' ')
|
2004-07-18 02:56:09 -03:00
|
|
|
if dt:
|
Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66394 | benjamin.peterson | 2008-09-11 17:04:02 -0500 (Thu, 11 Sep 2008) | 1 line
fix typo
........
r66404 | gerhard.haering | 2008-09-12 08:54:06 -0500 (Fri, 12 Sep 2008) | 2 lines
sqlite3 module: Mark iterdump() method as "Non-standard" like all the other methods not found in DB-API.
........
r66412 | gerhard.haering | 2008-09-12 13:58:57 -0500 (Fri, 12 Sep 2008) | 2 lines
Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python.
........
r66414 | gerhard.haering | 2008-09-12 17:33:22 -0500 (Fri, 12 Sep 2008) | 2 lines
Issue #3846: Release GIL during calls to sqlite3_prepare. This improves concurrent access to the same database file from multiple threads/processes.
........
r66424 | andrew.kuchling | 2008-09-12 20:22:08 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. (RM Barry gave permission to update the demos.)
........
r66425 | andrew.kuchling | 2008-09-12 20:27:33 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. From me: don't use string exception; flush stdout after printing
........
r66426 | andrew.kuchling | 2008-09-12 20:34:41 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. From me: don't use string exception; add __main__ section
........
r66427 | andrew.kuchling | 2008-09-12 20:42:55 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. From me: remove two stray semicolons
........
r66428 | andrew.kuchling | 2008-09-12 20:43:28 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division.
........
r66429 | andrew.kuchling | 2008-09-12 20:47:02 -0500 (Fri, 12 Sep 2008) | 1 line
Remove semicolon
........
r66430 | andrew.kuchling | 2008-09-12 20:48:36 -0500 (Fri, 12 Sep 2008) | 1 line
Subclass exception
........
r66431 | andrew.kuchling | 2008-09-12 20:56:56 -0500 (Fri, 12 Sep 2008) | 1 line
Fix SyntaxError
........
r66432 | andrew.kuchling | 2008-09-12 20:57:25 -0500 (Fri, 12 Sep 2008) | 1 line
Update uses of string exceptions
........
r66433 | andrew.kuchling | 2008-09-12 21:08:30 -0500 (Fri, 12 Sep 2008) | 1 line
Use title case
........
r66434 | andrew.kuchling | 2008-09-12 21:09:15 -0500 (Fri, 12 Sep 2008) | 1 line
Remove extra 'the'; the following title includes it
........
r66435 | andrew.kuchling | 2008-09-12 21:11:51 -0500 (Fri, 12 Sep 2008) | 1 line
#3288: Document as_integer_ratio
........
r66436 | andrew.kuchling | 2008-09-12 21:14:15 -0500 (Fri, 12 Sep 2008) | 1 line
Use title case
........
2008-09-13 12:58:53 -03:00
|
|
|
print("i.e.", int(size//dt), "bytes/sec", end=' ')
|
2007-07-17 17:59:35 -03:00
|
|
|
print()
|
2004-07-18 02:56:09 -03:00
|
|
|
remote._recv(id) # ignored
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
def fl():
|
2004-07-18 02:56:09 -03:00
|
|
|
sys.stdout.flush()
|
1995-04-10 08:40:52 -03:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
2004-07-18 02:56:09 -03:00
|
|
|
main()
|