|
|
@ -152,12 +152,6 @@ class RsyncProgressBar:
|
|
|
|
s = self.pipe.stdout.readline()
|
|
|
|
s = self.pipe.stdout.readline()
|
|
|
|
if len(s) == 0:
|
|
|
|
if len(s) == 0:
|
|
|
|
break
|
|
|
|
break
|
|
|
|
q = self.senderre.search(s)
|
|
|
|
|
|
|
|
if q:
|
|
|
|
|
|
|
|
maximum = int(q.groups()[0])
|
|
|
|
|
|
|
|
if self.maximum < maximum:
|
|
|
|
|
|
|
|
self.maximum = maximum
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
q = self.receiverre.search(s)
|
|
|
|
q = self.receiverre.search(s)
|
|
|
|
if q:
|
|
|
|
if q:
|
|
|
|
if not self.copyStarting:
|
|
|
|
if not self.copyStarting:
|
|
|
@ -485,7 +479,7 @@ class client(share):
|
|
|
|
--filter="P /.Xauthority" \
|
|
|
|
--filter="P /.Xauthority" \
|
|
|
|
--filter="P /.thumbnails" \
|
|
|
|
--filter="P /.thumbnails" \
|
|
|
|
--filter="P /.mozilla/firefox/*/Cache" \
|
|
|
|
--filter="P /.mozilla/firefox/*/Cache" \
|
|
|
|
--filter="P /FTP" -a -x -v -v -v -v %s/ %s/' %(homeTemplate,userHome)
|
|
|
|
--filter="P /FTP" -a -x -v -v -v %s/ %s/' %(homeTemplate,userHome)
|
|
|
|
elif sync == "logout":
|
|
|
|
elif sync == "logout":
|
|
|
|
if os.path.exists(userHome) and os.listdir(userHome) and\
|
|
|
|
if os.path.exists(userHome) and os.listdir(userHome) and\
|
|
|
|
os.path.exists(homeTemplate):
|
|
|
|
os.path.exists(homeTemplate):
|
|
|
@ -500,7 +494,7 @@ class client(share):
|
|
|
|
--exclude="/.kde4/socket-*" --exclude="/.kde4/share/config/phonondevicesrc" \
|
|
|
|
--exclude="/.kde4/socket-*" --exclude="/.kde4/share/config/phonondevicesrc" \
|
|
|
|
--exclude="/.thumbnails" \
|
|
|
|
--exclude="/.thumbnails" \
|
|
|
|
--exclude="/.mozilla/firefox/*/Cache" \
|
|
|
|
--exclude="/.mozilla/firefox/*/Cache" \
|
|
|
|
-a -x -v -v -v -v %s/ %s/'%(userHome,homeTemplate)
|
|
|
|
-a -x -v -v -v %s/ %s/'%(userHome,homeTemplate)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
self.printERROR(_("Method syncUser: option sync=%s incorrect")\
|
|
|
|
self.printERROR(_("Method syncUser: option sync=%s incorrect")\
|
|
|
|
%str(sync))
|
|
|
|
%str(sync))
|
|
|
@ -530,11 +524,11 @@ class client(share):
|
|
|
|
if numfiles is False:
|
|
|
|
if numfiles is False:
|
|
|
|
if os.path.exists(configFileName):
|
|
|
|
if os.path.exists(configFileName):
|
|
|
|
os.remove(configFileName)
|
|
|
|
os.remove(configFileName)
|
|
|
|
numfiles = 1
|
|
|
|
numfiles = 0
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
numfiles = int(numfiles)
|
|
|
|
numfiles = int(numfiles)
|
|
|
|
except:
|
|
|
|
except:
|
|
|
|
numfiles = 1
|
|
|
|
numfiles = 0
|
|
|
|
rsync.maximum = numfiles
|
|
|
|
rsync.maximum = numfiles
|
|
|
|
if progress:
|
|
|
|
if progress:
|
|
|
|
rsync.run()
|
|
|
|
rsync.run()
|
|
|
|