get_messages check if uid folder exists
This commit is contained in:
parent
d6549ea19d
commit
60d77071c5
17
main.py
17
main.py
@ -76,17 +76,16 @@ class Meshenger:
|
|||||||
|
|
||||||
if self.devices[device] > foreign_node_update:
|
if self.devices[device] > foreign_node_update:
|
||||||
print 'Foreign node"s index is newer, proceed to download index'
|
print 'Foreign node"s index is newer, proceed to download index'
|
||||||
status = self.get_index(device, nodepath)
|
if not self.get_index(device, nodepath):
|
||||||
if not status:
|
|
||||||
print 'index wget failed'
|
print 'index wget failed'
|
||||||
continue
|
continue
|
||||||
|
|
||||||
print 'downloading messages'
|
print 'downloading messages'
|
||||||
status = self.get_messages(device, nodepath)
|
if not self.get_messages(device, nodepath):
|
||||||
if not status:
|
|
||||||
print 'getting messages failed'
|
print 'getting messages failed'
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
print 'updating node timestamp'
|
||||||
self.node_timestamp(device)
|
self.node_timestamp(device)
|
||||||
|
|
||||||
time.sleep(5) #free process or ctrl+c
|
time.sleep(5) #free process or ctrl+c
|
||||||
@ -252,10 +251,18 @@ Get new messages from other node based on it's index file
|
|||||||
index = index.read().split('\n')
|
index = index.read().split('\n')
|
||||||
for message in index:
|
for message in index:
|
||||||
# messagepath = os.path.join(os.path.abspath(self.msg_dir), message)
|
# messagepath = os.path.join(os.path.abspath(self.msg_dir), message)
|
||||||
|
parts = message.split('/')
|
||||||
|
dirpath = os.path.join( parts[0], parts[1])
|
||||||
|
if not os.path.isdir( dirpath ):
|
||||||
|
os.mkdir( dirpath )
|
||||||
|
|
||||||
messagepath = os.path.relpath( message )
|
messagepath = os.path.relpath( message )
|
||||||
if not os.path.exists(messagepath):
|
if not os.path.exists(messagepath):
|
||||||
print 'downloading', message, 'to', messagepath
|
print 'downloading', message, 'to', messagepath
|
||||||
status = subprocess.call('wget http://['+ip+'%adhoc0]:' + self.serve_port + '/' + message+' -O ' + messagepath, shell=True)
|
command = 'wget http://['+ip+'%adhoc0]:' + self.serve_port + '/' + message+' -O ' + messagepath
|
||||||
|
print command
|
||||||
|
status = subprocess.call( command, shell=True)
|
||||||
|
print 'get_messages wget status: ', status
|
||||||
return status == 0
|
return status == 0
|
||||||
except:
|
except:
|
||||||
print 'Failed to download messages'
|
print 'Failed to download messages'
|
||||||
|
Loading…
Reference in New Issue
Block a user