refactoring

This commit is contained in:
ingvar1995 2016-10-22 21:23:03 +03:00
parent c4843148e4
commit 9f745d9795
5 changed files with 376 additions and 338 deletions

112
toxygen/basecontact.py Normal file
View file

@ -0,0 +1,112 @@
from settings import *
try:
from PySide import QtCore, QtGui
except ImportError:
from PyQt4 import QtCore, QtGui
from toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE
class BaseContact:
"""
Class encapsulating TOX contact
Properties: name (alias of contact or name), status_message, status (connection status)
widget - widget for update
"""
def __init__(self, name, status_message, widget, tox_id):
"""
:param name: name, example: 'Toxygen user'
:param status_message: status message, example: 'Toxing on Toxygen'
:param widget: ContactItem instance
:param tox_id: tox id of contact
"""
self._name, self._status_message = name, status_message
self._status, self._widget = None, widget
self._widget.name.setText(name)
self._widget.status_message.setText(status_message)
self._tox_id = tox_id
self.load_avatar()
# -----------------------------------------------------------------------------------------------------------------
# name - current name or alias of user
# -----------------------------------------------------------------------------------------------------------------
def get_name(self):
return self._name
def set_name(self, value):
self._name = str(value, 'utf-8')
self._widget.name.setText(self._name)
self._widget.name.repaint()
name = property(get_name, set_name)
# -----------------------------------------------------------------------------------------------------------------
# Status message
# -----------------------------------------------------------------------------------------------------------------
def get_status_message(self):
return self._status_message
def set_status_message(self, value):
self._status_message = str(value, 'utf-8')
self._widget.status_message.setText(self._status_message)
self._widget.status_message.repaint()
status_message = property(get_status_message, set_status_message)
# -----------------------------------------------------------------------------------------------------------------
# Status
# -----------------------------------------------------------------------------------------------------------------
def get_status(self):
return self._status
def set_status(self, value):
self._status = value
self._widget.connection_status.update(value)
status = property(get_status, set_status)
# -----------------------------------------------------------------------------------------------------------------
# TOX ID. WARNING: for friend it will return public key, for profile - full address
# -----------------------------------------------------------------------------------------------------------------
def get_tox_id(self):
return self._tox_id
tox_id = property(get_tox_id)
# -----------------------------------------------------------------------------------------------------------------
# Avatars
# -----------------------------------------------------------------------------------------------------------------
def load_avatar(self):
"""
Tries to load avatar of contact or uses default avatar
"""
avatar_path = '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
os.chdir(ProfileHelper.get_path() + 'avatars/')
if not os.path.isfile(avatar_path): # load default image
avatar_path = 'avatar.png'
os.chdir(curr_directory() + '/images/')
width = self._widget.avatar_label.width()
pixmap = QtGui.QPixmap(avatar_path)
self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation))
self._widget.avatar_label.repaint()
def reset_avatar(self):
avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
if os.path.isfile(avatar_path):
os.remove(avatar_path)
self.load_avatar()
def set_avatar(self, avatar):
avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
with open(avatar_path, 'wb') as f:
f.write(avatar)
self.load_avatar()
def get_pixmap(self):
return self._widget.avatar_label.pixmap()

View file

@ -1,113 +1,224 @@
import os
from settings import *
try: try:
from PySide import QtCore, QtGui from PySide import QtCore, QtGui
except ImportError: except ImportError:
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE from history import *
import basecontact
import util
from messages import *
import file_transfers as ft
class Contact: class Contact(basecontact.BaseContact):
""" """
Class encapsulating TOX contact Class encapsulating TOX contact
Properties: name (alias of contact or name), status_message, status (connection status) Properties: name (alias of contact or name), status_message, status (connection status)
widget - widget for update widget - widget for update
""" """
def __init__(self, name, status_message, widget, tox_id): def __init__(self, message_getter, number, name, status_message, widget, tox_id):
""" """
:param name: name, example: 'Toxygen user' :param message_getter: gets messages from db
:param status_message: status message, example: 'Toxing on Toxygen' :param number: number of friend.
:param widget: ContactItem instance
:param tox_id: tox id of contact
""" """
self._name, self._status_message = name, status_message super().__init__(name, status_message, widget, tox_id)
self._status, self._widget = None, widget self._number = number
self._widget.name.setText(name) self._new_messages = False
self._widget.status_message.setText(status_message) self._visible = True
self._tox_id = tox_id self._alias = False
self.load_avatar() self._message_getter = message_getter
self._corr = []
self._unsaved_messages = 0
self._history_loaded = self._new_actions = False
self._receipts = 0
self._curr_text = ''
def __del__(self):
self.set_visibility(False)
del self._widget
if hasattr(self, '_message_getter'):
del self._message_getter
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
# name - current name or alias of user # History support
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
def get_name(self): def load_corr(self, first_time=True):
return self._name """
:param first_time: friend became active, load first part of messages
"""
if (first_time and self._history_loaded) or (not hasattr(self, '_message_getter')):
return
data = list(self._message_getter.get(PAGE_SIZE))
if data is not None and len(data):
data.reverse()
else:
return
data = list(map(lambda tupl: TextMessage(*tupl), data))
self._corr = data + self._corr
self._history_loaded = True
def load_all_corr(self):
data = list(self._message_getter.get_all())
if data is not None and len(data):
data.reverse()
data = list(map(lambda tupl: TextMessage(*tupl), data))
self._corr = data + self._corr
self._history_loaded = True
def get_corr_for_saving(self):
"""
Get data to save in db
:return: list of unsaved messages or []
"""
messages = list(filter(lambda x: x.get_type() <= 1, self._corr))
return list(map(lambda x: x.get_data(), messages[-self._unsaved_messages:])) if self._unsaved_messages else []
def get_corr(self):
return self._corr[:]
def append_message(self, message):
"""
:param message: text or file transfer message
"""
self._corr.append(message)
if message.get_type() <= 1:
self._unsaved_messages += 1
def get_last_message_text(self):
messages = list(filter(lambda x: x.get_type() <= 1 and x.get_owner() != MESSAGE_OWNER['FRIEND'], self._corr))
if messages:
return messages[-1].get_data()[0]
else:
return ''
def get_unsent_messages(self):
"""
:return list of unsent messages
"""
messages = filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
return list(messages)
def get_unsent_messages_for_saving(self):
"""
:return list of unsent messages for saving
"""
messages = filter(lambda x: x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
return list(map(lambda x: x.get_data(), messages))
def delete_message(self, time):
elem = list(filter(lambda x: type(x) is TextMessage and x.get_data()[2] == time, self._corr))[0]
tmp = list(filter(lambda x: x.get_type() <= 1, self._corr))
if elem in tmp[-self._unsaved_messages:] and self._unsaved_messages:
self._unsaved_messages -= 1
self._corr.remove(elem)
self._message_getter.delete_one()
def delete_old_messages(self):
old = filter(lambda x: x.get_type() in (2, 3) and (x.get_status() >= 2 or x.get_status() is None),
self._corr[:-SAVE_MESSAGES])
old = list(old)
l = max(len(self._corr) - SAVE_MESSAGES, 0) - len(old)
self._unsaved_messages -= l
self._corr = old + self._corr[-SAVE_MESSAGES:]
def mark_as_sent(self):
try:
message = list(filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr))[0]
message.mark_as_sent()
except Exception as ex:
util.log('Mark as sent ex: ' + str(ex))
def clear_corr(self, save_unsent=False):
"""
Clear messages list
"""
if hasattr(self, '_message_getter'):
del self._message_getter
# don't delete data about active file transfer
if not save_unsent:
self._corr = list(filter(lambda x: x.get_type() == 2 and
x.get_status() in ft.ACTIVE_FILE_TRANSFERS, self._corr))
self._unsaved_messages = 0
else:
self._corr = list(filter(lambda x: (x.get_type() == 2 and x.get_status() in ft.ACTIVE_FILE_TRANSFERS)
or (x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT']),
self._corr))
self._unsaved_messages = len(self.get_unsent_messages())
def get_curr_text(self):
return self._curr_text
def set_curr_text(self, value):
self._curr_text = value
curr_text = property(get_curr_text, set_curr_text)
# -----------------------------------------------------------------------------------------------------------------
# Alias support
# -----------------------------------------------------------------------------------------------------------------
def set_name(self, value): def set_name(self, value):
self._name = str(value, 'utf-8')
self._widget.name.setText(self._name)
self._widget.name.repaint()
name = property(get_name, set_name)
# -----------------------------------------------------------------------------------------------------------------
# Status message
# -----------------------------------------------------------------------------------------------------------------
def get_status_message(self):
return self._status_message
def set_status_message(self, value):
self._status_message = str(value, 'utf-8')
self._widget.status_message.setText(self._status_message)
self._widget.status_message.repaint()
status_message = property(get_status_message, set_status_message)
# -----------------------------------------------------------------------------------------------------------------
# Status
# -----------------------------------------------------------------------------------------------------------------
def get_status(self):
return self._status
def set_status(self, value):
self._status = value
self._widget.connection_status.update(value)
status = property(get_status, set_status)
# -----------------------------------------------------------------------------------------------------------------
# TOX ID. WARNING: for friend it will return public key, for profile - full address
# -----------------------------------------------------------------------------------------------------------------
def get_tox_id(self):
return self._tox_id
tox_id = property(get_tox_id)
# -----------------------------------------------------------------------------------------------------------------
# Avatars
# -----------------------------------------------------------------------------------------------------------------
def load_avatar(self):
""" """
Tries to load avatar of contact or uses default avatar Set new name or ignore if alias exists
:param value: new name
""" """
avatar_path = '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2]) if not self._alias:
os.chdir(ProfileHelper.get_path() + 'avatars/') super().set_name(value)
if not os.path.isfile(avatar_path): # load default image
avatar_path = 'avatar.png'
os.chdir(curr_directory() + '/images/')
width = self._widget.avatar_label.width()
pixmap = QtGui.QPixmap(avatar_path)
self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation))
self._widget.avatar_label.repaint()
def reset_avatar(self): def set_alias(self, alias):
avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2]) self._alias = bool(alias)
if os.path.isfile(avatar_path):
os.remove(avatar_path)
self.load_avatar()
def set_avatar(self, avatar): # -----------------------------------------------------------------------------------------------------------------
avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2]) # Visibility in friends' list
with open(avatar_path, 'wb') as f: # -----------------------------------------------------------------------------------------------------------------
f.write(avatar)
self.load_avatar()
def get_pixmap(self): def get_visibility(self):
return self._widget.avatar_label.pixmap() return self._visible
def set_visibility(self, value):
self._visible = value
visibility = property(get_visibility, set_visibility)
# -----------------------------------------------------------------------------------------------------------------
# Unread messages from friend
# -----------------------------------------------------------------------------------------------------------------
def get_actions(self):
return self._new_actions
def set_actions(self, value):
self._new_actions = value
self._widget.connection_status.update(self.status, value)
actions = property(get_actions, set_actions) # unread messages, incoming files, av calls
def get_messages(self):
return self._new_messages
def inc_messages(self):
self._new_messages += 1
self._new_actions = True
self._widget.connection_status.update(self.status, True)
self._widget.messages.update(self._new_messages)
def reset_messages(self):
self._new_actions = False
self._new_messages = 0
self._widget.messages.update(self._new_messages)
self._widget.connection_status.update(self.status, False)
messages = property(get_messages)
# -----------------------------------------------------------------------------------------------------------------
# Friend's number (can be used in toxcore)
# -----------------------------------------------------------------------------------------------------------------
def get_number(self):
return self._number
def set_number(self, value):
self._number = value
number = property(get_number, set_number)

View file

@ -1,8 +1,5 @@
import contact import contact
from messages import * from messages import *
from history import *
import util
import file_transfers as ft
class Friend(contact.Contact): class Friend(contact.Contact):
@ -10,148 +7,13 @@ class Friend(contact.Contact):
Friend in list of friends. Can be hidden, properties 'has unread messages' and 'has alias' added Friend in list of friends. Can be hidden, properties 'has unread messages' and 'has alias' added
""" """
def __init__(self, message_getter, number, *args): def __init__(self, message_getter, number, name, status_message, widget, tox_id):
""" """
:param message_getter: gets messages from db :param message_getter: gets messages from db
:param number: number of friend. :param number: number of friend.
""" """
super(Friend, self).__init__(*args) super().__init__(message_getter, number, name, status_message, widget, tox_id)
self._number = number
self._new_messages = False
self._visible = True
self._alias = False
self._message_getter = message_getter
self._corr = []
self._unsaved_messages = 0
self._history_loaded = self._new_actions = False
self._receipts = 0 self._receipts = 0
self._curr_text = ''
def __del__(self):
self.set_visibility(False)
del self._widget
if hasattr(self, '_message_getter'):
del self._message_getter
# -----------------------------------------------------------------------------------------------------------------
# History support
# -----------------------------------------------------------------------------------------------------------------
def get_receipts(self):
return self._receipts
receipts = property(get_receipts) # read receipts
def inc_receipts(self):
self._receipts += 1
def dec_receipt(self):
if self._receipts:
self._receipts -= 1
self.mark_as_sent()
def load_corr(self, first_time=True):
"""
:param first_time: friend became active, load first part of messages
"""
if (first_time and self._history_loaded) or (not hasattr(self, '_message_getter')):
return
data = list(self._message_getter.get(PAGE_SIZE))
if data is not None and len(data):
data.reverse()
else:
return
data = list(map(lambda tupl: TextMessage(*tupl), data))
self._corr = data + self._corr
self._history_loaded = True
def load_all_corr(self):
data = list(self._message_getter.get_all())
if data is not None and len(data):
data.reverse()
data = list(map(lambda tupl: TextMessage(*tupl), data))
self._corr = data + self._corr
self._history_loaded = True
def get_corr_for_saving(self):
"""
Get data to save in db
:return: list of unsaved messages or []
"""
messages = list(filter(lambda x: x.get_type() <= 1, self._corr))
return list(map(lambda x: x.get_data(), messages[-self._unsaved_messages:])) if self._unsaved_messages else []
def get_corr(self):
return self._corr[:]
def append_message(self, message):
"""
:param message: text or file transfer message
"""
self._corr.append(message)
if message.get_type() <= 1:
self._unsaved_messages += 1
def get_last_message_text(self):
messages = list(filter(lambda x: x.get_type() <= 1 and x.get_owner() != MESSAGE_OWNER['FRIEND'], self._corr))
if messages:
return messages[-1].get_data()[0]
else:
return ''
def get_unsent_messages(self):
"""
:return list of unsent messages
"""
messages = filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
return list(messages)
def get_unsent_messages_for_saving(self):
"""
:return list of unsent messages for saving
"""
messages = filter(lambda x: x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
return list(map(lambda x: x.get_data(), messages))
def delete_message(self, time):
elem = list(filter(lambda x: type(x) is TextMessage and x.get_data()[2] == time, self._corr))[0]
tmp = list(filter(lambda x: x.get_type() <= 1, self._corr))
if elem in tmp[-self._unsaved_messages:] and self._unsaved_messages:
self._unsaved_messages -= 1
self._corr.remove(elem)
self._message_getter.delete_one()
def mark_as_sent(self):
try:
message = list(filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr))[0]
message.mark_as_sent()
except Exception as ex:
util.log('Mark as sent ex: ' + str(ex))
def clear_corr(self, save_unsent=False):
"""
Clear messages list
"""
if hasattr(self, '_message_getter'):
del self._message_getter
# don't delete data about active file transfer
if not save_unsent:
self._corr = list(filter(lambda x: x.get_type() == 2 and
x.get_status() in ft.ACTIVE_FILE_TRANSFERS, self._corr))
self._unsaved_messages = 0
else:
self._corr = list(filter(lambda x: (x.get_type() == 2 and x.get_status() in ft.ACTIVE_FILE_TRANSFERS)
or (x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT']),
self._corr))
self._unsaved_messages = len(self.get_unsent_messages())
def get_curr_text(self):
return self._curr_text
def set_curr_text(self, value):
self._curr_text = value
curr_text = property(get_curr_text, set_curr_text)
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
# File transfers support # File transfers support
@ -183,70 +45,18 @@ class Friend(contact.Contact):
self._corr = list(filter(lambda x: not (type(x) is UnsentFile and x.get_data()[2] == time), self._corr)) self._corr = list(filter(lambda x: not (type(x) is UnsentFile and x.get_data()[2] == time), self._corr))
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
# Alias support # History support
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
def set_name(self, value): def get_receipts(self):
""" return self._receipts
Set new name or ignore if alias exists
:param value: new name
"""
if not self._alias:
super(Friend, self).set_name(value)
def set_alias(self, alias): receipts = property(get_receipts) # read receipts
self._alias = bool(alias)
# ----------------------------------------------------------------------------------------------------------------- def inc_receipts(self):
# Visibility in friends' list self._receipts += 1
# -----------------------------------------------------------------------------------------------------------------
def get_visibility(self): def dec_receipt(self):
return self._visible if self._receipts:
self._receipts -= 1
def set_visibility(self, value): self.mark_as_sent()
self._visible = value
visibility = property(get_visibility, set_visibility)
# -----------------------------------------------------------------------------------------------------------------
# Unread messages from friend
# -----------------------------------------------------------------------------------------------------------------
def get_actions(self):
return self._new_actions
def set_actions(self, value):
self._new_actions = value
self._widget.connection_status.update(self.status, value)
actions = property(get_actions, set_actions) # unread messages, incoming files, av calls
def get_messages(self):
return self._new_messages
def inc_messages(self):
self._new_messages += 1
self._new_actions = True
self._widget.connection_status.update(self.status, True)
self._widget.messages.update(self._new_messages)
def reset_messages(self):
self._new_actions = False
self._new_messages = 0
self._widget.messages.update(self._new_messages)
self._widget.connection_status.update(self.status, False)
messages = property(get_messages)
# -----------------------------------------------------------------------------------------------------------------
# Friend's number (can be used in toxcore)
# -----------------------------------------------------------------------------------------------------------------
def get_number(self):
return self._number
def set_number(self, value):
self._number = value
number = property(get_number, set_number)

View file

@ -9,6 +9,8 @@ PAGE_SIZE = 42
TIMEOUT = 11 TIMEOUT = 11
SAVE_MESSAGES = 150
MESSAGE_OWNER = { MESSAGE_OWNER = {
'ME': 0, 'ME': 0,
'FRIEND': 1, 'FRIEND': 1,

View file

@ -15,9 +15,10 @@ import time
import calls import calls
import avwidgets import avwidgets
import plugin_support import plugin_support
import basecontact
class Profile(contact.Contact, Singleton): class Profile(basecontact.BaseContact, Singleton):
""" """
Profile of current toxygen user. Contains friends list, tox instance Profile of current toxygen user. Contains friends list, tox instance
""" """
@ -26,7 +27,7 @@ class Profile(contact.Contact, Singleton):
:param tox: tox instance :param tox: tox instance
:param screen: ref to main screen :param screen: ref to main screen
""" """
contact.Contact.__init__(self, basecontact.BaseContact.__init__(self,
tox.self_get_name(), tox.self_get_name(),
tox.self_get_status_message(), tox.self_get_status_message(),
screen.user_info, screen.user_info,
@ -42,6 +43,7 @@ class Profile(contact.Contact, Singleton):
settings = Settings.get_instance() settings = Settings.get_instance()
self._show_online = settings['show_online_friends'] self._show_online = settings['show_online_friends']
self._show_avatars = settings['show_avatars'] self._show_avatars = settings['show_avatars']
self._filter_string = ''
self._friend_item_height = 40 if settings['compact_mode'] else 70 self._friend_item_height = 40 if settings['compact_mode'] else 70
self._paused_file_transfers = dict(settings['paused_file_transfers']) self._paused_file_transfers = dict(settings['paused_file_transfers'])
# key - file id, value: [path, friend number, is incoming, start position] # key - file id, value: [path, friend number, is incoming, start position]
@ -49,7 +51,7 @@ class Profile(contact.Contact, Singleton):
aliases = settings['friends_aliases'] aliases = settings['friends_aliases']
data = tox.self_get_friend_list() data = tox.self_get_friend_list()
self._history = History(tox.self_get_public_key()) # connection to db self._history = History(tox.self_get_public_key()) # connection to db
self._friends, self._active_friend = [], -1 self._contacts, self._active_friend = [], -1
for i in data: # creates list of friends for i in data: # creates list of friends
tox_id = tox.friend_get_public_key(i) tox_id = tox.friend_get_public_key(i)
try: try:
@ -64,7 +66,7 @@ class Profile(contact.Contact, Singleton):
message_getter = self._history.messages_getter(tox_id) message_getter = self._history.messages_getter(tox_id)
friend = Friend(message_getter, i, name, status_message, item, tox_id) friend = Friend(message_getter, i, name, status_message, item, tox_id)
friend.set_alias(alias) friend.set_alias(alias)
self._friends.append(friend) self._contacts.append(friend)
self.filtration(self._show_online) self.filtration(self._show_online)
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
@ -94,7 +96,7 @@ class Profile(contact.Contact, Singleton):
message = QtGui.QApplication.translate("MainWindow", 'User {} is now known as {}', None, message = QtGui.QApplication.translate("MainWindow", 'User {} is now known as {}', None,
QtGui.QApplication.UnicodeUTF8) QtGui.QApplication.UnicodeUTF8)
message = message.format(tmp, value) message = message.format(tmp, value)
for friend in self._friends: for friend in self._contacts:
friend.append_message(InfoMessage(message, time.time())) friend.append_message(InfoMessage(message, time.time()))
if self._active_friend + 1: if self._active_friend + 1:
self.create_message_item(message, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE']) self.create_message_item(message, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
@ -123,7 +125,7 @@ class Profile(contact.Contact, Singleton):
""" """
filter_str = filter_str.lower() filter_str = filter_str.lower()
settings = Settings.get_instance() settings = Settings.get_instance()
for index, friend in enumerate(self._friends): for index, friend in enumerate(self._contacts):
friend.visibility = (friend.status is not None or not show_online) and (filter_str in friend.name.lower()) friend.visibility = (friend.status is not None or not show_online) and (filter_str in friend.name.lower())
friend.visibility = friend.visibility or friend.messages or friend.actions friend.visibility = friend.visibility or friend.messages or friend.actions
if friend.visibility: if friend.visibility:
@ -142,10 +144,10 @@ class Profile(contact.Contact, Singleton):
self.filtration(self._show_online, self._filter_string) self.filtration(self._show_online, self._filter_string)
def get_friend_by_number(self, num): def get_friend_by_number(self, num):
return list(filter(lambda x: x.number == num, self._friends))[0] return list(filter(lambda x: x.number == num, self._contacts))[0]
def get_friend(self, num): def get_friend(self, num):
return self._friends[num] return self._contacts[num]
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
# Work with active friend # Work with active friend
@ -175,14 +177,16 @@ class Profile(contact.Contact, Singleton):
if value is not None: if value is not None:
if self._active_friend + 1 and self._active_friend != value: if self._active_friend + 1 and self._active_friend != value:
try: try:
self._friends[self._active_friend].curr_text = self._screen.messageEdit.toPlainText() self._contacts[self._active_friend].curr_text = self._screen.messageEdit.toPlainText()
except: except:
pass pass
friend = self._friends[value] friend = self._contacts[value]
if self._active_friend != value: if self._active_friend != value:
self._screen.messageEdit.setPlainText(friend.curr_text) self._screen.messageEdit.setPlainText(friend.curr_text)
self._active_friend = value self._active_friend = value
self._friends[value].reset_messages() friend.reset_messages()
if not Settings.get_instance()['save_history']:
friend.delete_old_messages()
self._messages.clear() self._messages.clear()
friend.load_corr() friend.load_corr()
messages = friend.get_corr()[-PAGE_SIZE:] messages = friend.get_corr()[-PAGE_SIZE:]
@ -223,7 +227,7 @@ class Profile(contact.Contact, Singleton):
else: else:
self._screen.call_finished() self._screen.call_finished()
else: else:
friend = self._friends[self._active_friend] friend = self._contacts[self._active_friend]
self._screen.account_name.setText(friend.name) self._screen.account_name.setText(friend.name)
self._screen.account_status.setText(friend.status_message) self._screen.account_status.setText(friend.status_message)
@ -243,16 +247,16 @@ class Profile(contact.Contact, Singleton):
active_friend = property(get_active, set_active) active_friend = property(get_active, set_active)
def get_last_message(self): def get_last_message(self):
return self._friends[self._active_friend].get_last_message_text() return self._contacts[self._active_friend].get_last_message_text()
def get_active_number(self): def get_active_number(self):
return self._friends[self._active_friend].number if self._active_friend + 1 else -1 return self._contacts[self._active_friend].number if self._active_friend + 1 else -1
def get_active_name(self): def get_active_name(self):
return self._friends[self._active_friend].name if self._active_friend + 1 else '' return self._contacts[self._active_friend].name if self._active_friend + 1 else ''
def is_active_online(self): def is_active_online(self):
return self._active_friend + 1 and self._friends[self._active_friend].status is not None return self._active_friend + 1 and self._contacts[self._active_friend].status is not None
def new_name(self, number, name): def new_name(self, number, name):
friend = self.get_friend_by_number(number) friend = self.get_friend_by_number(number)
@ -327,7 +331,7 @@ class Profile(contact.Contact, Singleton):
""" """
if Settings.get_instance()['typing_notifications'] and self._active_friend + 1: if Settings.get_instance()['typing_notifications'] and self._active_friend + 1:
try: try:
friend = self._friends[self._active_friend] friend = self._contacts[self._active_friend]
if friend.status is not None: if friend.status is not None:
self._tox.self_set_typing(friend.number, typing) self._tox.self_set_typing(friend.number, typing)
except: except:
@ -397,7 +401,7 @@ class Profile(contact.Contact, Singleton):
t = time.time() t = time.time()
self.create_message_item(message, t, MESSAGE_OWNER['FRIEND'], message_type) self.create_message_item(message, t, MESSAGE_OWNER['FRIEND'], message_type)
self._messages.scrollToBottom() self._messages.scrollToBottom()
self._friends[self._active_friend].append_message( self._contacts[self._active_friend].append_message(
TextMessage(message, MESSAGE_OWNER['FRIEND'], t, message_type)) TextMessage(message, MESSAGE_OWNER['FRIEND'], t, message_type))
else: else:
friend = self.get_friend_by_number(friend_num) friend = self.get_friend_by_number(friend_num)
@ -436,7 +440,7 @@ class Profile(contact.Contact, Singleton):
friend.append_message(TextMessage(text, MESSAGE_OWNER['NOT_SENT'], t, message_type)) friend.append_message(TextMessage(text, MESSAGE_OWNER['NOT_SENT'], t, message_type))
def delete_message(self, time): def delete_message(self, time):
friend = self._friends[self._active_friend] friend = self._contacts[self._active_friend]
friend.delete_message(time) friend.delete_message(time)
self._history.delete_message(friend.tox_id, time) self._history.delete_message(friend.tox_id, time)
self.update() self.update()
@ -452,7 +456,7 @@ class Profile(contact.Contact, Singleton):
s = Settings.get_instance() s = Settings.get_instance()
if hasattr(self, '_history'): if hasattr(self, '_history'):
if s['save_history']: if s['save_history']:
for friend in self._friends: for friend in self._contacts:
if not self._history.friend_exists_in_db(friend.tox_id): if not self._history.friend_exists_in_db(friend.tox_id):
self._history.add_friend_to_db(friend.tox_id) self._history.add_friend_to_db(friend.tox_id)
if not s['save_unsent_only']: if not s['save_unsent_only']:
@ -472,13 +476,13 @@ class Profile(contact.Contact, Singleton):
Clear chat history Clear chat history
""" """
if num is not None: if num is not None:
friend = self._friends[num] friend = self._contacts[num]
friend.clear_corr(save_unsent) friend.clear_corr(save_unsent)
if self._history.friend_exists_in_db(friend.tox_id): if self._history.friend_exists_in_db(friend.tox_id):
self._history.delete_messages(friend.tox_id) self._history.delete_messages(friend.tox_id)
self._history.delete_friend_from_db(friend.tox_id) self._history.delete_friend_from_db(friend.tox_id)
else: # clear all history else: # clear all history
for number in range(len(self._friends)): for number in range(len(self._contacts)):
self.clear_history(number, save_unsent) self.clear_history(number, save_unsent)
if num is None or num == self.get_active_number(): if num is None or num == self.get_active_number():
self.update() self.update()
@ -490,7 +494,7 @@ class Profile(contact.Contact, Singleton):
if not self._load_history: if not self._load_history:
return return
self._load_history = False self._load_history = False
friend = self._friends[self._active_friend] friend = self._contacts[self._active_friend]
friend.load_corr(False) friend.load_corr(False)
data = friend.get_corr() data = friend.get_corr()
if not data: if not data:
@ -532,10 +536,9 @@ class Profile(contact.Contact, Singleton):
self._history.export(directory) self._history.export(directory)
def export_history(self, num, as_text=True, _range=None): def export_history(self, num, as_text=True, _range=None):
friend = self._friends[num] friend = self._contacts[num]
if _range is None: if _range is None:
friend.load_all_corr() friend.load_all_corr()
if _range is None:
corr = friend.get_corr() corr = friend.get_corr()
elif _range[1] + 1: elif _range[1] + 1:
corr = friend.get_corr()[_range[0]:_range[1] + 1] corr = friend.get_corr()[_range[0]:_range[1] + 1]
@ -583,7 +586,7 @@ class Profile(contact.Contact, Singleton):
name = self._name name = self._name
item = MessageItem(text, time, name, owner != MESSAGE_OWNER['NOT_SENT'], message_type, self._messages) item = MessageItem(text, time, name, owner != MESSAGE_OWNER['NOT_SENT'], message_type, self._messages)
if self._show_avatars: if self._show_avatars:
item.set_avatar(self._friends[self._active_friend].get_pixmap() if owner == MESSAGE_OWNER[ item.set_avatar(self._contacts[self._active_friend].get_pixmap() if owner == MESSAGE_OWNER[
'FRIEND'] else self.get_pixmap()) 'FRIEND'] else self.get_pixmap())
elem = QtGui.QListWidgetItem() elem = QtGui.QListWidgetItem()
elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height())) elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height()))
@ -640,7 +643,7 @@ class Profile(contact.Contact, Singleton):
""" """
Set new alias for friend Set new alias for friend
""" """
friend = self._friends[num] friend = self._contacts[num]
name = friend.name name = friend.name
dialog = QtGui.QApplication.translate('MainWindow', dialog = QtGui.QApplication.translate('MainWindow',
"Enter new alias for friend {} or leave empty to use friend's name:", "Enter new alias for friend {} or leave empty to use friend's name:",
@ -678,14 +681,14 @@ class Profile(contact.Contact, Singleton):
self.update() self.update()
def friend_public_key(self, num): def friend_public_key(self, num):
return self._friends[num].tox_id return self._contacts[num].tox_id
def delete_friend(self, num): def delete_friend(self, num):
""" """
Removes friend from contact list Removes friend from contact list
:param num: number of friend in list :param num: number of friend in list
""" """
friend = self._friends[num] friend = self._contacts[num]
settings = Settings.get_instance() settings = Settings.get_instance()
try: try:
index = list(map(lambda x: x[0], settings['friends_aliases'])).index(friend.tox_id) index = list(map(lambda x: x[0], settings['friends_aliases'])).index(friend.tox_id)
@ -699,10 +702,10 @@ class Profile(contact.Contact, Singleton):
if self._history.friend_exists_in_db(friend.tox_id): if self._history.friend_exists_in_db(friend.tox_id):
self._history.delete_friend_from_db(friend.tox_id) self._history.delete_friend_from_db(friend.tox_id)
self._tox.friend_delete(friend.number) self._tox.friend_delete(friend.number)
del self._friends[num] del self._contacts[num]
self._screen.friends_list.takeItem(num) self._screen.friends_list.takeItem(num)
if num == self._active_friend: # active friend was deleted if num == self._active_friend: # active friend was deleted
if not len(self._friends): # last friend was deleted if not len(self._contacts): # last friend was deleted
self.set_active(-1) self.set_active(-1)
else: else:
self.set_active(0) self.set_active(0)
@ -723,7 +726,7 @@ class Profile(contact.Contact, Singleton):
log('Accept friend request failed! ' + str(ex)) log('Accept friend request failed! ' + str(ex))
message_getter = None message_getter = None
friend = Friend(message_getter, num, tox_id, '', item, tox_id) friend = Friend(message_getter, num, tox_id, '', item, tox_id)
self._friends.append(friend) self._contacts.append(friend)
def block_user(self, tox_id): def block_user(self, tox_id):
""" """
@ -790,7 +793,7 @@ class Profile(contact.Contact, Singleton):
self._history.add_friend_to_db(tox_id) self._history.add_friend_to_db(tox_id)
message_getter = self._history.messages_getter(tox_id) message_getter = self._history.messages_getter(tox_id)
friend = Friend(message_getter, result, tox_id, '', item, tox_id) friend = Friend(message_getter, result, tox_id, '', item, tox_id)
self._friends.append(friend) self._contacts.append(friend)
data = self._tox.get_savedata() data = self._tox.get_savedata()
ProfileHelper.get_instance().save_profile(data) ProfileHelper.get_instance().save_profile(data)
return True return True
@ -825,7 +828,7 @@ class Profile(contact.Contact, Singleton):
Recreate tox instance Recreate tox instance
:param restart: method which calls restart and returns new tox instance :param restart: method which calls restart and returns new tox instance
""" """
for friend in self._friends: for friend in self._contacts:
self.friend_exit(friend.number) self.friend_exit(friend.number)
self._call.stop() self._call.stop()
del self._call del self._call
@ -833,20 +836,20 @@ class Profile(contact.Contact, Singleton):
self._tox = restart() self._tox = restart()
self._call = calls.AV(self._tox.AV) self._call = calls.AV(self._tox.AV)
self.status = None self.status = None
for friend in self._friends: for friend in self._contacts:
friend.number = self._tox.friend_by_public_key(friend.tox_id) # numbers update friend.number = self._tox.friend_by_public_key(friend.tox_id) # numbers update
self.update_filtration() self.update_filtration()
def reconnect(self): def reconnect(self):
if self.status is None or all(list(map(lambda x: x.status is None, self._friends))): if self.status is None or all(list(map(lambda x: x.status is None, self._contacts))) and len(self._contacts):
self.reset(self._screen.reset) self.reset(self._screen.reset)
QtCore.QTimer.singleShot(45000, self.reconnect) QtCore.QTimer.singleShot(45000, self.reconnect)
def close(self): def close(self):
for friend in self._friends: for friend in self._contacts:
self.friend_exit(friend.number) self.friend_exit(friend.number)
for i in range(len(self._friends)): for i in range(len(self._contacts)):
del self._friends[0] del self._contacts[0]
if hasattr(self, '_call'): if hasattr(self, '_call'):
self._call.stop() self._call.stop()
del self._call del self._call
@ -954,7 +957,7 @@ class Profile(contact.Contact, Singleton):
0, -1) 0, -1)
def cancel_not_started_transfer(self, time): def cancel_not_started_transfer(self, time):
self._friends[self._active_friend].delete_one_unsent_file(time) self._contacts[self._active_friend].delete_one_unsent_file(time)
self.update() self.update()
def pause_transfer(self, friend_number, file_number, by_friend=False): def pause_transfer(self, friend_number, file_number, by_friend=False):
@ -1082,7 +1085,7 @@ class Profile(contact.Contact, Singleton):
item = self.create_file_transfer_item(tm) item = self.create_file_transfer_item(tm)
st.set_state_changed_handler(item.update) st.set_state_changed_handler(item.update)
self._messages.scrollToBottom() self._messages.scrollToBottom()
self._friends[friend_number].append_message(tm) self._contacts[friend_number].append_message(tm)
def incoming_chunk(self, friend_number, file_number, position, data): def incoming_chunk(self, friend_number, file_number, position, data):
""" """
@ -1157,12 +1160,12 @@ class Profile(contact.Contact, Singleton):
def reset_avatar(self): def reset_avatar(self):
super(Profile, self).reset_avatar() super(Profile, self).reset_avatar()
for friend in filter(lambda x: x.status is not None, self._friends): for friend in filter(lambda x: x.status is not None, self._contacts):
self.send_avatar(friend.number) self.send_avatar(friend.number)
def set_avatar(self, data): def set_avatar(self, data):
super(Profile, self).set_avatar(data) super(Profile, self).set_avatar(data)
for friend in filter(lambda x: x.status is not None, self._friends): for friend in filter(lambda x: x.status is not None, self._contacts):
self.send_avatar(friend.number) self.send_avatar(friend.number)
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
@ -1188,7 +1191,7 @@ class Profile(contact.Contact, Singleton):
else: else:
text = QtGui.QApplication.translate("incoming_call", "Outgoing audio call", None, text = QtGui.QApplication.translate("incoming_call", "Outgoing audio call", None,
QtGui.QApplication.UnicodeUTF8) QtGui.QApplication.UnicodeUTF8)
self._friends[self._active_friend].append_message(InfoMessage(text, time.time())) self._contacts[self._active_friend].append_message(InfoMessage(text, time.time()))
self.create_message_item(text, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE']) self.create_message_item(text, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
self._messages.scrollToBottom() self._messages.scrollToBottom()
elif num in self._call: # finish or cancel call if you call with active friend elif num in self._call: # finish or cancel call if you call with active friend