Liderahenk/Ahenk
1
0
Fork 0
mirror of https://github.com/Pardus-LiderAhenk/ahenk synced 2024-12-26 03:02:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

file transfers were fixed and receive messages triggers events now

Browse source
This commit is contained in:
Volkan Şahin 2016-03-08 18:08:07 +02:00
parent e0f68c9bf2
commit 8b62344e48
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
opt/ahenk/base/messaging/MessageReceiver.py
View file

@ -34,10 +34,10 @@ class MessageReceiver(slixmpp.ClientXMPP):
self.room=None
self.receiver=self.configurationManager.get('CONNECTION', 'receiverjid')+'@'+self.configurationManager.get('CONNECTION', 'host')+'/Smack'
self.nick = self.configurationManager.get('CONNECTION', 'nick')
self.receivefile=self.configurationManager.get('CONNECTION', 'receiveFileParam')
self.receive_file_path=self.configurationManager.get('CONNECTION', 'receiveFileParam')
#TODO get default folder path from receivefile
self.file = open('/home/volkan/Desktop/yaz.txt', 'rb')
#self.file = open('/home/volkan/Desktop/yaz.txt', 'rb')
self.register_extensions()
self.add_listeners()
@ -47,7 +47,7 @@ class MessageReceiver(slixmpp.ClientXMPP):
if self.configurationManager.get('CONNECTION', 'uid') == "" or self.configurationManager.get('CONNECTION', 'uid') is None:
return str(self.configurationManager.get('CONNECTION', 'host')) #is user want to create connection as anonymous
else:
return str(self.configurationManager.get('CONNECTION', 'uid')+'@'+self.configurationManager.get('CONNECTION', 'host')+'/ahenk')
return str(self.configurationManager.get('CONNECTION', 'uid')+'@'+self.configurationManager.get('CONNECTION', 'host')+'/1793816026658382528511590341137904818696727194330755982493')
def get_password(self):
if self.configurationManager.get('CONNECTION', 'password') == "" or self.configurationManager.get('CONNECTION', 'password') is None:
@ -62,10 +62,15 @@ class MessageReceiver(slixmpp.ClientXMPP):
self.add_event_handler("socks5_data", self.stream_data)
self.add_event_handler("socks5_closed", self.stream_closed)
self.add_event_handler("ibb_stream_start", self.stream_opened)
self.add_event_handler("ibb_stream_data", self.stream_data)
self.add_event_handler("ibb_stream_end", self.stream_closed)
def stream_opened(self, sid):
print('stream opened')
#self.logger.info('Stream opened. %s', sid)
return open('/home/volkan/Desktop/ooo.txt', 'wb')
self.file = open(self.receive_file_path+self.stream_id, 'wb')
return self.file
def stream_data(self, data):
print('stream data')
@ -97,12 +102,12 @@ class MessageReceiver(slixmpp.ClientXMPP):
else:
print("%s : %s" % (str(msg['mucnick']),str(msg['body'])))
def recv_direct_message(self, msg):
def recv_direct_message(self, msg): #TODO burada mesajın type ını event olarak fırlat
if msg['type'] in ('chat', 'normal'):
print ("event will be fired - %s : %s" % (msg['from'], msg['body']))
j = json.loads(str(msg['body']))
type =j['type']
self.event_manger.fireEvent('type',str(msg['body']))
print ("event will be fired:"+type)
self.event_manger.fireEvent(type,str(msg['body']))
def connect_to_server(self):# Connect to the XMPP server and start processing XMPP stanzas.
@ -123,7 +128,8 @@ class MessageReceiver(slixmpp.ClientXMPP):
self.register_plugin('xep_0030') # Service Discovery
self.register_plugin('xep_0045') # Multi-User Chat
self.register_plugin('xep_0199') # XMPP Ping
self.register_plugin('xep_0065') # SOCKS5 Bytestreams
self.register_plugin('xep_0065', {'auto_accept': True}) # SOCKS5 Bytestreams
self.register_plugin('xep_0047', {'auto_accept': True}) # In-band Bytestreams
#self.logger.info('Extension were registered: xep_0030,xep_0045,xep_0199,xep_0065')
return True

14
opt/ahenk/base/messaging/MessageSender.py
View file

@ -30,7 +30,6 @@ class MessageSender(slixmpp.ClientXMPP):
self.my_pass=self.get_password()
slixmpp.ClientXMPP.__init__(self, self.my_jid,self.my_pass)
#slixmpp.ClientXMPP.__init__(self, "volkan@localhost/ahenk","volkan")
self.message=None
self.file=None
@ -70,7 +69,7 @@ class MessageSender(slixmpp.ClientXMPP):
if msg['type'] in ('chat', 'normal'):
print ("%s : %s" % (msg['from'], msg['body']))
self.disconnect()
self.event_manager.fireEvent('confirm_registration',str(msg['body']))
self.event_manager.fireEvent('confirm_registration',str(msg['body'])) #only anonymous account can fire confirm_registration
@asyncio.coroutine
@ -79,7 +78,6 @@ class MessageSender(slixmpp.ClientXMPP):
self.send_presence()
if self.message is not None:
print("send dire")
self.send_direct_message(self.message)
if self.file is not None:
@ -101,12 +99,13 @@ class MessageSender(slixmpp.ClientXMPP):
finally:
self.file.close()
if self.message is None and self.file is None:
if (self.message is None and self.file is None) or self.get_password() is not None:
self.disconnect()
def stream_opened(self, sid):
#self.logger.info('Stream opened. %s', sid)
return open(self.receivefile, 'wb')
self.file = open(self.receive_file_path+self.stream_id, 'wb')
return self.file
def stream_data(self, data):
#self.logger.info('Stream data.')
@ -115,11 +114,12 @@ class MessageSender(slixmpp.ClientXMPP):
def stream_closed(self, exception):
#self.logger.info('Stream closed. %s', exception)
self.file.close()
#self.disconnect()
self.disconnect()
def send_direct_message(self,msg):
#need connection control
self.send_message(mto=self.receiver,mbody=msg,mtype='chat')
print("sending...\n"+msg)
self.send_message(mto=self.receiver,mbody=msg,mtype='normal')
def connect_to_server(self):# Connect to the XMPP server and start processing XMPP stanzas.
try: