leetnightshade/p4scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed scripts up, improved logging so console has a waking thread now.

Browse source 
Also fixed bug if console timer is too long it'll be killed off
appropriately.
This commit is contained in:
unknown 2015-05-13 12:06:54 -06:00
parent ea14f96d76
commit 92d217371c
3 changed files with 50 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
p4SyncMissingFiles.py
View file

@ -32,10 +32,10 @@ class P4SyncMissing:
directory = normpath( options.directory if options.directory is not None else os.getcwd( ) )
with Console( auto_flush_time=1000 ) as c:
with Console( auto_flush_time=1 ) as c:
with P4Workspace( directory ):
if not options.quiet:
c.writeflush( "Preparing to sync missing files..." )
c.writeflush( "Retreiving missing files..." )
c.writeflush( " Setting up threads..." )
# Setup threading
@ -44,18 +44,29 @@ class P4SyncMissing:
def shutdown( data ):
return False
def sync( files ):
files_len = len(files)
files_flat = ' '.join('"' + f + '"' for f in files)
if options.verbose:
files_len = len(files)
if files_len > 1:
c.write( " Syncing batch of " + str(len(files)) + " ...")
for f in files:
c.write( " " + os.path.relpath( f, directory ) )
else:
for f in files:
c.write( " Syncing " + os.path.relpath( f, directory ) + " ..." )
ret = -1
count = 0
while ret != 0 and count < 2:
ret = try_call_process( "p4 sync -f " + files_flat )
count += 1
#if ret != 0 and not options.quiet:
# c.write("Failed, trying again to sync " + files_flat)
if ret != 0 and not options.quiet:
c.write("Failed, trying again to sync " + files_flat)
if ret != 0:
pass
#if not options.quiet:
# c.write("Failed to sync " + files_flat)
if not options.quiet:
c.write("Failed to sync " + files_flat)
else:
if not options.quiet:
files_len = len(files)
@ -74,13 +85,17 @@ class P4SyncMissing:
thread_count = options.thread_count if options.thread_count > 0 else multiprocessing.cpu_count( ) + threads
count = 0
total = 0
self.queue = multiprocessing.JoinableQueue( )
for i in range( thread_count ):
t = Worker( c, self.queue, commands )
t.daemon = True
threads.append( t )
t.start( )
c.writeflush( " Done." )
make_drive_upper = True if os.name == 'nt' or sys.platform == 'cygwin' else False
command = "p4 fstat ..."
@ -105,6 +120,7 @@ class P4SyncMissing:
file_type = None
file_type_last = None
# todo: use fewer threads, increase bucket size and use p4 threading
class Bucket:
def __init__(self, limit):
self.queue = []
@ -118,7 +134,7 @@ class P4SyncMissing:
self.buckets = {}
self.buckets[file_type_text] = Bucket(10)
self.buckets[file_type_binary] = Bucket(1)
self.buckets[file_type_binary] = Bucket(2)
def push_queued(bucket):
if bucket.queue_size == 0:
@ -153,11 +169,12 @@ class P4SyncMissing:
if any(file_action == a for a in rejected_actions):
file_action = None
else:
total += 1
if os.path.exists( client_file ):
file_action = None
elif line.startswith( clientFile_tag ):
client_file = normpath( line[ len( clientFile_tag ) : ].strip( ) )
client_file = line[ len( clientFile_tag ) : ].strip( )
if make_drive_upper:
drive, path = splitdrive( client_file )
client_file = ''.join( [ drive.upper( ), path ] )
@ -176,7 +193,8 @@ class P4SyncMissing:
c.write(line)#log as error
if not options.quiet:
c.writeflush( " Checking " + str(count) + " file(s), now waiting for threads..." )
c.writeflush( " Done. Checked " + str(total) + " file(s)." )
c.writeflush( " Queued " + str(count) + " file(s), now waiting for threads..." )
for i in range( thread_count ):
self.queue.put( ( WRK.SHUTDOWN, None ) )
@ -184,6 +202,9 @@ class P4SyncMissing:
for t in threads:
t.join( )
if not options.quiet:
print( " Done." )
if not options.quiet:
print( "Done." )