text not found message box

tests/tests.py

@@ -1,6 +1,6 @@
 from toxygen.profile import *
 from toxygen.tox_dns import tox_dns
-import toxygen.toxencryptsave as encr
+import toxygen.toxes as encr
 import toxygen.messages as m
 import time
 
@@ -53,8 +53,8 @@ class TestEncryption:
     def test_encr_decr(self):
         tox = tox_factory()
         data = tox.get_savedata()
-        lib = encr.ToxEncryptSave()
-        for password in ('easypassword', 'njvnjfnvaGGV6', 'toxygen'):
+        lib = encr.ToxES()
+        for password in ('easypassword', 'njvnFjfn7vaGGV6', 'toxygen'):
             lib.set_password(password)
             copy_data = data[:]
             new_data = lib.pass_encrypt(data)

toxygen/basecontact.py

@@ -84,11 +84,10 @@ class BaseContact:
         """
         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/')
+        prefix = ProfileHelper.get_path() + 'avatars/'
+        avatar_path = prefix + '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
+        if not os.path.isfile(avatar_path) or not os.path.getsize(avatar_path):  # load default image
+            avatar_path = curr_directory() + '/images/avatar.png'
         width = self._widget.avatar_label.width()
         pixmap = QtGui.QPixmap(avatar_path)
         self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio,

toxygen/contact.py

@@ -7,6 +7,7 @@ import basecontact
 import util
 from messages import *
 import file_transfers as ft
+import re
 
 
 class Contact(basecontact.BaseContact):
@@ -30,7 +31,8 @@ class Contact(basecontact.BaseContact):
         self._unsaved_messages = 0
         self._history_loaded = self._new_actions = False
         self._receipts = 0
-        self._curr_text = ''
+        self._curr_text = self._search_string = ''
+        self._search_index = 0
 
     def __del__(self):
         self.set_visibility(False)
@@ -94,6 +96,10 @@ class Contact(basecontact.BaseContact):
         else:
             return ''
 
+    # -----------------------------------------------------------------------------------------------------------------
+    # Unsent messages
+    # -----------------------------------------------------------------------------------------------------------------
+
     def get_unsent_messages(self):
         """
         :return list of unsent messages
@@ -108,25 +114,6 @@ class Contact(basecontact.BaseContact):
         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):
-        """
-        Delete old messages (reduces RAM if messages saving is not enabled)
-        """
-        old = filter(lambda x: x.get_type() == 2 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]
@@ -134,12 +121,38 @@ class Contact(basecontact.BaseContact):
         except Exception as ex:
             util.log('Mark as sent ex: ' + str(ex))
 
+    # -----------------------------------------------------------------------------------------------------------------
+    # Message deletion
+    # -----------------------------------------------------------------------------------------------------------------
+
+    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()
+        self._search_index = 0
+
+    def delete_old_messages(self):
+        """
+        Delete old messages (reduces RAM usage if messages saving is not enabled)
+        """
+        old = filter(lambda x: x.get_type() == 2 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:]
+        self._search_index = 0
+
     def clear_corr(self, save_unsent=False):
         """
         Clear messages list
         """
         if hasattr(self, '_message_getter'):
             del self._message_getter
+        self._search_index = 0
         # don't delete data about active file transfer
         if not save_unsent:
             self._corr = list(filter(lambda x: x.get_type() == 2 and
@@ -151,6 +164,45 @@ class Contact(basecontact.BaseContact):
                                      self._corr))
             self._unsaved_messages = len(self.get_unsent_messages())
 
+    # -----------------------------------------------------------------------------------------------------------------
+    # Chat history search
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def search_string(self, search_string):
+        self._search_string, self._search_index = search_string, 0
+        return self.search_prev()
+
+    def search_prev(self):
+        while True:
+            l = len(self._corr)
+            for i in range(self._search_index - 1, -l - 1, -1):
+                if type(self._corr[i]) is not TextMessage:
+                    continue
+                message = self._corr[i].get_data()[0]
+                if re.search(self._search_string, message, re.IGNORECASE) is not None:
+                    self._search_index = i
+                    return i
+            self._search_index = -l
+            self.load_corr(False)
+            if len(self._corr) == l:
+                return None  # not found
+
+    def search_next(self):
+        if not self._search_index:
+            return None
+        for i in range(self._search_index + 1, 0):
+            if type(self._corr[i]) is not TextMessage:
+                continue
+            message = self._corr[i].get_data()[0]
+            if re.search(self._search_string, message, re.IGNORECASE) is not None:
+                self._search_index = i
+                return i
+        return None  # not found
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Current text - text from message area
+    # -----------------------------------------------------------------------------------------------------------------
+
     def get_curr_text(self):
         return self._curr_text
 

toxygen/file_transfers.py

@@ -32,6 +32,10 @@ SHOW_PROGRESS_BAR = (0, 1, 4)
 ALLOWED_FILES = ('toxygen_inline.png', 'utox-inline.png', 'sticker.png')
 
 
+def is_inline(file_name):
+    return file_name in ALLOWED_FILES or file_name.startswith('qTox_Screenshot_')
+
+
 class StateSignal(QtCore.QObject):
 
     signal = QtCore.Signal(int, float, int)  # state, progress, time in sec

toxygen/history.py

@@ -2,7 +2,7 @@ from sqlite3 import connect
 import settings
 from os import chdir
 import os.path
-from toxencryptsave import ToxEncryptSave
+from toxes import ToxES
 
 
 PAGE_SIZE = 42
@@ -25,7 +25,7 @@ class History:
         chdir(settings.ProfileHelper.get_path())
         path = settings.ProfileHelper.get_path() + self._name + '.hstr'
         if os.path.exists(path):
-            decr = ToxEncryptSave.get_instance()
+            decr = ToxES.get_instance()
             try:
                 with open(path, 'rb') as fin:
                     data = fin.read()
@@ -43,7 +43,7 @@ class History:
         db.close()
 
     def save(self):
-        encr = ToxEncryptSave.get_instance()
+        encr = ToxES.get_instance()
         if encr.has_password():
             path = settings.ProfileHelper.get_path() + self._name + '.hstr'
             with open(path, 'rb') as fin:
@@ -57,7 +57,7 @@ class History:
         new_path = directory + self._name + '.hstr'
         with open(path, 'rb') as fin:
             data = fin.read()
-        encr = ToxEncryptSave.get_instance()
+        encr = ToxES.get_instance()
         if encr.has_password():
             data = encr.pass_encrypt(data)
         with open(new_path, 'wb') as fout:

toxygen/list_items.py

@@ -11,6 +11,7 @@ from widgets import DataLabel, create_menu
 import html as h
 import smileys
 import settings
+import re
 
 
 class MessageEdit(QtGui.QTextBrowser):
@@ -189,6 +190,31 @@ class MessageItem(QtGui.QWidget):
         self.message.setFixedHeight(self.height())
         self.name.setPixmap(pixmap.scaled(30, 30, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation))
 
+    def select_text(self, text):
+        tmp = self.message.toHtml()
+        text = h.escape(text)
+        strings = re.findall(text, tmp, flags=re.IGNORECASE)
+        for s in strings:
+            tmp = self.replace_all(tmp, s)
+        self.message.setHtml(tmp)
+
+    @staticmethod
+    def replace_all(text, substring):
+        i, l = 0, len(substring)
+        while i < len(text) - l + 1:
+            index = text[i:].find(substring)
+            if index == -1:
+                break
+            i += index
+            lgt, rgt = text[i:].find('<'), text[i:].find('>')
+            if rgt < lgt:
+                i += rgt + 1
+                continue
+            sub = '<font color="red"><b>{}</b></font>'.format(substring)
+            text = text[:i] + sub + text[i + l:]
+            i += len(sub)
+        return text
+
 
 class ContactItem(QtGui.QWidget):
     """

toxygen/main.py

@@ -12,7 +12,7 @@ from callbacks import init_callbacks, stop, start
 from util import curr_directory, program_version, remove, is_64_bit
 import styles.style
 import platform
-import toxencryptsave
+import toxes
 from passwordscreen import PasswordScreen, UnlockAppScreen, SetProfilePasswordScreen
 from plugin_support import PluginLoader
 import updater
@@ -37,7 +37,7 @@ class Toxygen:
         Show password screen
         """
         tmp = [data]
-        p = PasswordScreen(toxencryptsave.ToxEncryptSave.get_instance(), tmp)
+        p = PasswordScreen(toxes.ToxES.get_instance(), tmp)
         p.show()
         self.app.connect(self.app, QtCore.SIGNAL("lastWindowClosed()"), self.app, QtCore.SLOT("quit()"))
         self.app.exec_()
@@ -62,7 +62,7 @@ class Toxygen:
             dark_style = fl.read()
         app.setStyleSheet(dark_style)
 
-        encrypt_save = toxencryptsave.ToxEncryptSave()
+        encrypt_save = toxes.ToxES()
 
         if self.path is not None:
             path = os.path.dirname(self.path) + '/'
@@ -199,9 +199,10 @@ class Toxygen:
         class Menu(QtGui.QMenu):
 
             def newStatus(self, status):
-                profile.Profile.get_instance().set_status(status)
-                self.aboutToShow()
-                self.hide()
+                if not Settings.get_instance().locked:
+                    profile.Profile.get_instance().set_status(status)
+                    self.aboutToShow()
+                    self.hide()
 
             def aboutToShow(self):
                 status = profile.Profile.get_instance().status
@@ -248,7 +249,7 @@ class Toxygen:
                 def correct_pass():
                     show()
                     Settings.get_instance().locked = False
-                self.p = UnlockAppScreen(toxencryptsave.ToxEncryptSave.get_instance(), correct_pass)
+                self.p = UnlockAppScreen(toxes.ToxES.get_instance(), correct_pass)
                 self.p.show()
 
         def tray_activated(reason):
@@ -256,8 +257,9 @@ class Toxygen:
                 show_window()
 
         def close_app():
-            settings.closing = True
-            self.ms.close()
+            if not Settings.get_instance().locked:
+                settings.closing = True
+                self.ms.close()
 
         m.connect(show, QtCore.SIGNAL("triggered()"), show_window)
         m.connect(exit, QtCore.SIGNAL("triggered()"), close_app)
@@ -475,6 +477,10 @@ def configure():
             pass
 
 
+def reset():
+    Settings.reset_auto_profile()
+
+
 def main():
     if len(sys.argv) == 1:
         toxygen = Toxygen()
@@ -484,7 +490,7 @@ def main():
             print('Toxygen v' + program_version)
             return
         elif arg == '--help':
-            print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version')
+            print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version\ntoxygen --reset')
             return
         elif arg == '--configure':
             configure()
@@ -492,6 +498,9 @@ def main():
         elif arg == '--clean':
             clean()
             return
+        elif arg == '--reset':
+            reset()
+            return
         else:
             toxygen = Toxygen(arg)
     toxygen.main()

toxygen/mainscreen.py

@@ -5,6 +5,8 @@ from widgets import MultilineEdit, LineEdit, ComboBox
 import plugin_support
 from mainscreen_widgets import *
 import settings
+import platform
+import toxes
 
 
 class MainWindow(QtGui.QMainWindow, Singleton):
@@ -374,8 +376,12 @@ class MainWindow(QtGui.QMainWindow, Singleton):
         self.close()
 
     def resizeEvent(self, *args, **kwargs):
-        self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 159)
-        self.friends_list.setGeometry(0, 0, 270, self.height() - 129)
+        if platform.system() == 'Windows':
+            self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
+            self.friends_list.setGeometry(0, 0, 270, self.height() - 125)
+        else:
+            self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 159)
+            self.friends_list.setGeometry(0, 0, 270, self.height() - 129)
 
         self.videocallButton.setGeometry(QtCore.QRect(self.width() - 330, 10, 50, 50))
         self.callButton.setGeometry(QtCore.QRect(self.width() - 390, 10, 50, 50))
@@ -401,6 +407,8 @@ class MainWindow(QtGui.QMainWindow, Singleton):
             clipboard.setText(s)
         elif event.key() == QtCore.Qt.Key_Z and event.modifiers() & QtCore.Qt.ControlModifier and self.messages.selectedIndexes():
             self.messages.clearSelection()
+        elif event.key() == QtCore.Qt.Key_F and event.modifiers() & QtCore.Qt.ControlModifier:
+            self.show_search_field()
         else:
             super(MainWindow, self).keyPressEvent(event)
 
@@ -473,7 +481,7 @@ class MainWindow(QtGui.QMainWindow, Singleton):
             msgBox.exec_()
 
     def lock_app(self):
-        if toxencryptsave.ToxEncryptSave.get_instance().has_password():
+        if toxes.ToxES.get_instance().has_password():
             Settings.get_instance().locked = True
             self.hide()
         else:
@@ -685,7 +693,22 @@ class MainWindow(QtGui.QMainWindow, Singleton):
         else:
             super(MainWindow, self).mouseReleaseEvent(event)
 
+    def show(self):
+        super().show()
+        self.profile.update()
+
     def filtering(self):
         ind = self.online_contacts.currentIndex()
         d = {0: 0, 1: 1, 2: 2, 3: 4, 4: 1 | 4, 5: 2 | 4}
         self.profile.filtration_and_sorting(d[ind], self.contact_name.text())
+
+    def show_search_field(self):
+        if hasattr(self, 'search_field') and self.search_field.isVisible():
+            return
+        if self.profile.get_curr_friend() is None:
+            return
+        self.search_field = SearchScreen(self.messages, self.messages.width(), self.messages.parent())
+        x, y = self.messages.x(), self.messages.y() + self.messages.height() - 40
+        self.search_field.setGeometry(x, y, self.messages.width(), 40)
+        self.messages.setGeometry(x, self.messages.y(), self.messages.width(), self.messages.height() - 40)
+        self.search_field.show()

toxygen/mainscreen_widgets.py

@@ -2,7 +2,7 @@ try:
     from PySide import QtCore, QtGui
 except ImportError:
     from PyQt4 import QtCore, QtGui
-from widgets import RubberBand, create_menu, QRightClickButton, CenteredWidget
+from widgets import RubberBand, create_menu, QRightClickButton, CenteredWidget, LineEdit
 from profile import Profile
 import smileys
 import util
@@ -404,3 +404,128 @@ class MainMenuButton(QtGui.QPushButton):
         metrics = QtGui.QFontMetrics(self.font())
         self.setFixedWidth(metrics.size(QtCore.Qt.TextSingleLine, text).width() + 20)
         super().setText(text)
+
+
+class ClickableLabel(QtGui.QLabel):
+
+    def __init__(self, *args):
+        super().__init__(*args)
+
+    def mouseReleaseEvent(self, ev):
+        self.emit(QtCore.SIGNAL('clicked()'))
+
+
+class SearchScreen(QtGui.QWidget):
+
+    def __init__(self, messages, width, *args):
+        super().__init__(*args)
+        self.setMaximumSize(width, 40)
+        self.setMinimumSize(width, 40)
+        self._messages = messages
+
+        self.search_text = LineEdit(self)
+        self.search_text.setGeometry(0, 0, width - 160, 40)
+
+        self.search_button = ClickableLabel(self)
+        self.search_button.setGeometry(width - 160, 0, 40, 40)
+        pixmap = QtGui.QPixmap()
+        pixmap.load(util.curr_directory() + '/images/search.png')
+        self.search_button.setScaledContents(False)
+        self.search_button.setAlignment(QtCore.Qt.AlignCenter)
+        self.search_button.setPixmap(pixmap)
+        self.connect(self.search_button, QtCore.SIGNAL('clicked()'), self.search)
+
+        font = QtGui.QFont()
+        font.setPointSize(32)
+        font.setBold(True)
+
+        self.prev_button = QtGui.QPushButton(self)
+        self.prev_button.setGeometry(width - 120, 0, 40, 40)
+        self.prev_button.clicked.connect(self.prev)
+        self.prev_button.setText('\u25B2')
+
+        self.next_button = QtGui.QPushButton(self)
+        self.next_button.setGeometry(width - 80, 0, 40, 40)
+        self.next_button.clicked.connect(self.next)
+        self.next_button.setText('\u25BC')
+
+        self.close_button = QtGui.QPushButton(self)
+        self.close_button.setGeometry(width - 40, 0, 40, 40)
+        self.close_button.clicked.connect(self.close)
+        self.close_button.setText('×')
+        self.close_button.setFont(font)
+
+        font.setPointSize(18)
+        self.next_button.setFont(font)
+        self.prev_button.setFont(font)
+
+        self.retranslateUi()
+
+    def retranslateUi(self):
+        self.search_text.setPlaceholderText(QtGui.QApplication.translate("MainWindow", "Search", None,
+                                                                         QtGui.QApplication.UnicodeUTF8))
+
+    def show(self):
+        super().show()
+        self.search_text.setFocus()
+
+    def search(self):
+        Profile.get_instance().update()
+        text = self.search_text.text()
+        friend = Profile.get_instance().get_curr_friend()
+        if text and friend and util.is_re_valid(text):
+            index = friend.search_string(text)
+            self.load_messages(index)
+
+    def prev(self):
+        friend = Profile.get_instance().get_curr_friend()
+        if friend is not None:
+            index = friend.search_prev()
+            self.load_messages(index)
+
+    def next(self):
+        friend = Profile.get_instance().get_curr_friend()
+        text = self.search_text.text()
+        if friend is not None:
+            index = friend.search_next()
+            if index is not None:
+                count = self._messages.count()
+                index += count
+                item = self._messages.item(index)
+                self._messages.scrollToItem(item)
+                self._messages.itemWidget(item).select_text(text)
+            else:
+                self.not_found(text)
+
+    def load_messages(self, index):
+        text = self.search_text.text()
+        if index is not None:
+            profile = Profile.get_instance()
+            count = self._messages.count()
+            while count + index < 0:
+                profile.load_history()
+                count = self._messages.count()
+            index += count
+            item = self._messages.item(index)
+            self._messages.scrollToItem(item)
+            self._messages.itemWidget(item).select_text(text)
+        else:
+            self.not_found(text)
+
+    def closeEvent(self, *args):
+        Profile.get_instance().update()
+        self._messages.setGeometry(0, 0, self._messages.width(), self._messages.height() + 40)
+        super().closeEvent(*args)
+
+    @staticmethod
+    def not_found(text):
+        mbox = QtGui.QMessageBox()
+        mbox.setText(QtGui.QApplication.translate("MainWindow",
+                                                  'Text "{}" was not found'.format(text),
+                                                  None,
+                                                  QtGui.QApplication.UnicodeUTF8))
+        mbox.setWindowTitle(QtGui.QApplication.translate("MainWindow",
+                                                         'Not found',
+                                                         None,
+                                                         QtGui.QApplication.UnicodeUTF8))
+        mbox.exec_()

toxygen/menu.py

@@ -7,7 +7,7 @@ from profile import Profile
 from util import curr_directory, copy
 from widgets import CenteredWidget, DataLabel, LineEdit
 import pyaudio
-import toxencryptsave
+import toxes
 import plugin_support
 import updater
 
@@ -215,7 +215,7 @@ class ProfileSettings(CenteredWidget):
     def new_password(self):
         if self.password.text() == self.confirm_password.text():
             if not len(self.password.text()) or len(self.password.text()) >= 8:
-                e = toxencryptsave.ToxEncryptSave.get_instance()
+                e = toxes.ToxES.get_instance()
                 e.set_password(self.password.text())
                 self.close()
             else:

toxygen/plugin_support.py

@@ -4,7 +4,7 @@ import os
 import importlib
 import inspect
 import plugins.plugin_super_class as pl
-import toxencryptsave
+import toxes
 import sys
 
 
@@ -16,7 +16,7 @@ class PluginLoader(util.Singleton):
         self._settings = settings
         self._plugins = {}  # dict. key - plugin unique short name, value - tuple (plugin instance, is active)
         self._tox = tox
-        self._encr = toxencryptsave.ToxEncryptSave.get_instance()
+        self._encr = toxes.ToxES.get_instance()
 
     def set_tox(self, tox):
         """

toxygen/plugins/plugin_super_class.py

@@ -31,7 +31,7 @@ def log(name, data):
 
 class PluginSuperClass:
     """
-    Superclass for all plugins. Plugin is python module with at least one class derived from PluginSuperClass.
+    Superclass for all plugins. Plugin is Python3 module with at least one class derived from PluginSuperClass.
     """
     is_plugin = True
 
@@ -43,7 +43,7 @@ class PluginSuperClass:
         :param tox: tox instance
         :param profile: profile instance
         :param settings: profile settings
-        :param encrypt_save: LibToxEncryptSave instance.
+        :param encrypt_save: ToxES instance.
         """
         self._settings = settings
         self._profile = profile
@@ -169,7 +169,7 @@ class PluginSuperClass:
     def load_settings(self):
         """
         This method loads settings of plugin and returns raw data
-        If file doesn't this method raises exception
+        If file doesn't exist this method raises exception
         """
         with open(path_to_data(self._short_name) + 'settings.json', 'rb') as fl:
             data = fl.read()

toxygen/profile.py

@@ -127,6 +127,7 @@ class Profile(basecontact.BaseContact, Singleton):
         """
         filter_str = filter_str.lower()
         settings = Settings.get_instance()
+        number = self.get_active_number()
         if sorting > 1:
             if sorting & 2:
                 self._contacts = sorted(self._contacts, key=lambda x: int(x.status is not None), reverse=True)
@@ -162,6 +163,7 @@ class Profile(basecontact.BaseContact, Singleton):
         self._sorting, self._filter_string = sorting, filter_str
         settings['sorting'] = self._sorting
         settings.save()
+        self.set_active_by_number(number)
 
     def update_filtration(self):
         """
@@ -181,6 +183,9 @@ class Profile(basecontact.BaseContact, Singleton):
             return None
         return self._contacts[num]
 
+    def get_curr_friend(self):
+        return self._contacts[self._active_friend] if self._active_friend + 1 else None
+
     # -----------------------------------------------------------------------------------------------------------------
     # Work with active friend
     # -----------------------------------------------------------------------------------------------------------------
@@ -209,7 +214,7 @@ class Profile(basecontact.BaseContact, Singleton):
             if value is not None:
                 if self._active_friend + 1 and self._active_friend != value:
                     try:
-                        self._contacts[self._active_friend].curr_text = self._screen.messageEdit.toPlainText()
+                        self.get_curr_friend().curr_text = self._screen.messageEdit.toPlainText()
                     except:
                         pass
                 friend = self._contacts[value]
@@ -259,7 +264,7 @@ class Profile(basecontact.BaseContact, Singleton):
                 else:
                     self._screen.call_finished()
             else:
-                friend = self._contacts[self._active_friend]
+                friend = self.get_curr_friend()
 
             self._screen.account_name.setText(friend.name)
             self._screen.account_status.setText(friend.status_message)
@@ -270,28 +275,33 @@ class Profile(basecontact.BaseContact, Singleton):
             pixmap = QtGui.QPixmap(avatar_path)
             self._screen.account_avatar.setPixmap(pixmap.scaled(64, 64, QtCore.Qt.KeepAspectRatio,
                                                                 QtCore.Qt.SmoothTransformation))
-            self.update_filtration()
         except Exception as ex:  # no friend found. ignore
             log('Friend value: ' + str(value))
             log('Error in set active: ' + str(ex))
             raise
 
+    def set_active_by_number(self, number):
+        for i in range(len(self._contacts)):
+            if self._contacts[i].number == number:
+                self._active_friend = i
+                break
+
     active_friend = property(get_active, set_active)
 
     def get_last_message(self):
         if self._active_friend + 1:
-            return self._contacts[self._active_friend].get_last_message_text()
+            return self.get_curr_friend().get_last_message_text()
         else:
             return ''
 
     def get_active_number(self):
-        return self._contacts[self._active_friend].number if self._active_friend + 1 else -1
+        return self.get_curr_friend().number if self._active_friend + 1 else -1
 
     def get_active_name(self):
-        return self._contacts[self._active_friend].name if self._active_friend + 1 else ''
+        return self.get_curr_friend().name if self._active_friend + 1 else ''
 
     def is_active_online(self):
-        return self._active_friend + 1 and self._contacts[self._active_friend].status is not None
+        return self._active_friend + 1 and self.get_curr_friend().status is not None
 
     def new_name(self, number, name):
         friend = self.get_friend_by_number(number)
@@ -366,7 +376,7 @@ class Profile(basecontact.BaseContact, Singleton):
         """
         if Settings.get_instance()['typing_notifications'] and self._active_friend + 1:
             try:
-                friend = self._contacts[self._active_friend]
+                friend = self.get_curr_friend()
                 if friend.status is not None:
                     self._tox.self_set_typing(friend.number, typing)
             except:
@@ -436,7 +446,7 @@ class Profile(basecontact.BaseContact, Singleton):
             t = time.time()
             self.create_message_item(message, t, MESSAGE_OWNER['FRIEND'], message_type)
             self._messages.scrollToBottom()
-            self._contacts[self._active_friend].append_message(
+            self.get_curr_friend().append_message(
                 TextMessage(message, MESSAGE_OWNER['FRIEND'], t, message_type))
         else:
             friend = self.get_friend_by_number(friend_num)
@@ -475,7 +485,7 @@ class Profile(basecontact.BaseContact, Singleton):
             friend.append_message(TextMessage(text, MESSAGE_OWNER['NOT_SENT'], t, message_type))
 
     def delete_message(self, time):
-        friend = self._contacts[self._active_friend]
+        friend = self.get_curr_friend()
         friend.delete_message(time)
         self._history.delete_message(friend.tox_id, time)
         self.update()
@@ -529,7 +539,7 @@ class Profile(basecontact.BaseContact, Singleton):
         if not self._load_history:
             return
         self._load_history = False
-        friend = self._contacts[self._active_friend]
+        friend = self.get_curr_friend()
         friend.load_corr(False)
         data = friend.get_corr()
         if not data:
@@ -617,7 +627,7 @@ class Profile(basecontact.BaseContact, Singleton):
         pixmap = None
         if self._show_avatars:
             if owner == MESSAGE_OWNER['FRIEND']:
-                pixmap = self._contacts[self._active_friend].get_pixmap()
+                pixmap = self.get_curr_friend().get_pixmap()
             else:
                 pixmap = self.get_pixmap()
         return self._factory.message_item(text, time, name, owner != MESSAGE_OWNER['NOT_SENT'],
@@ -876,7 +886,7 @@ class Profile(basecontact.BaseContact, Singleton):
         settings = Settings.get_instance()
         friend = self.get_friend_by_number(friend_number)
         auto = settings['allow_auto_accept'] and friend.tox_id in settings['auto_accept_from_friends']
-        inline = (file_name in ALLOWED_FILES) and settings['allow_inline']
+        inline = is_inline(file_name) and settings['allow_inline']
         file_id = self._tox.file_get_file_id(friend_number, file_number)
         accepted = True
         if file_id in self._paused_file_transfers:
@@ -961,7 +971,7 @@ class Profile(basecontact.BaseContact, Singleton):
                                                                                0, -1)
 
     def cancel_not_started_transfer(self, time):
-        self._contacts[self._active_friend].delete_one_unsent_file(time)
+        self.get_curr_friend().delete_one_unsent_file(time)
         self.update()
 
     def pause_transfer(self, friend_number, file_number, by_friend=False):
@@ -1144,7 +1154,6 @@ class Profile(basecontact.BaseContact, Singleton):
         if not os.path.isfile(avatar_path):  # reset image
             avatar_path = None
         sa = SendAvatar(avatar_path, self._tox, friend_number)
-        sa.set_transfer_finished_handler(self.transfer_finished)
         self._file_transfers[(friend_number, sa.get_file_number())] = sa
 
     def incoming_avatar(self, friend_number, file_number, size):
@@ -1157,6 +1166,7 @@ class Profile(basecontact.BaseContact, Singleton):
         ra = ReceiveAvatar(self._tox, friend_number, size, file_number)
         if ra.state != TOX_FILE_TRANSFER_STATE['CANCELLED']:
             self._file_transfers[(friend_number, file_number)] = ra
+            ra.set_transfer_finished_handler(self.transfer_finished)
         else:
             self.get_friend_by_number(friend_number).load_avatar()
             if self.get_active_number() == friend_number:
@@ -1195,7 +1205,7 @@ class Profile(basecontact.BaseContact, Singleton):
             else:
                 text = QtGui.QApplication.translate("incoming_call", "Outgoing audio call", None,
                                                     QtGui.QApplication.UnicodeUTF8)
-            self._contacts[self._active_friend].append_message(InfoMessage(text, time.time()))
+            self.get_curr_friend().append_message(InfoMessage(text, time.time()))
             self.create_message_item(text, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
             self._messages.scrollToBottom()
         elif num in self._call:  # finish or cancel call if you call with active friend

toxygen/settings.py

@@ -3,7 +3,7 @@ import json
 import os
 from util import Singleton, curr_directory, log, copy, append_slash
 import pyaudio
-from toxencryptsave import ToxEncryptSave
+from toxes import ToxES
 import smileys
 
 
@@ -19,7 +19,7 @@ class Settings(dict, Singleton):
         if os.path.isfile(self.path):
             with open(self.path, 'rb') as fl:
                 data = fl.read()
-            inst = ToxEncryptSave.get_instance()
+            inst = ToxES.get_instance()
             try:
                 if inst.is_data_encrypted(data):
                     data = inst.pass_decrypt(data)
@@ -167,7 +167,7 @@ class Settings(dict, Singleton):
 
     def save(self):
         text = json.dumps(self)
-        inst = ToxEncryptSave.get_instance()
+        inst = ToxES.get_instance()
         if inst.has_password():
             text = bytes(inst.pass_encrypt(bytes(text, 'utf-8')))
         else:
@@ -252,7 +252,7 @@ class ProfileHelper(Singleton):
         return self._directory
 
     def save_profile(self, data):
-        inst = ToxEncryptSave.get_instance()
+        inst = ToxES.get_instance()
         if inst.has_password():
             data = inst.pass_encrypt(data)
         with open(self._path, 'wb') as fl:

toxygen/styles/style.qss

@@ -1309,4 +1309,16 @@ QListWidget > QLabel
     image: none;
     width: 0px;
     height: 0px;
-}
+}
+
+ClickableLabel:focus
+{
+    border-width: 1px;
+    border-color: #4A4949;
+    border-style: solid;
+}
+
+ClickableLabel:hover
+{
+    background-color: #4A4949;
+}

toxygen/toxencryptsave.py

@@ -1,64 +1,25 @@
 import libtox
-import util
 from ctypes import c_size_t, create_string_buffer, byref, c_int, ArgumentError, c_char_p, c_bool
+from toxencryptsave_enums_and_consts import *
 
 
-TOX_ERR_ENCRYPTION = {
-    # The function returned successfully.
-    'OK': 0,
-    # Some input data, or maybe the output pointer, was null.
-    'NULL': 1,
-    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
-    # functions accepting keys do not produce this error.
-    'KEY_DERIVATION_FAILED': 2,
-    # The encryption itself failed.
-    'FAILED': 3
-}
-
-TOX_ERR_DECRYPTION = {
-    # The function returned successfully.
-    'OK': 0,
-    # Some input data, or maybe the output pointer, was null.
-    'NULL': 1,
-    # The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes
-    'INVALID_LENGTH': 2,
-    # The input data is missing the magic number (i.e. wasn't created by this module, or is corrupted)
-    'BAD_FORMAT': 3,
-    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
-    # functions accepting keys do not produce this error.
-    'KEY_DERIVATION_FAILED': 4,
-    # The encrypted byte array could not be decrypted. Either the data was corrupt or the password/key was incorrect.
-    'FAILED': 5,
-}
-
-TOX_PASS_ENCRYPTION_EXTRA_LENGTH = 80
-
-
-class ToxEncryptSave(util.Singleton):
+class ToxEncryptSave:
 
     def __init__(self):
-        super().__init__()
         self.libtoxencryptsave = libtox.LibToxEncryptSave()
-        self._passphrase = None
-
-    def set_password(self, passphrase):
-        self._passphrase = passphrase
-
-    def has_password(self):
-        return bool(self._passphrase)
-
-    def is_password(self, password):
-        return self._passphrase == password
 
     def is_data_encrypted(self, data):
+        """
+        Checks if given data is encrypted
+        """
         func = self.libtoxencryptsave.tox_is_data_encrypted
         func.restype = c_bool
         result = func(c_char_p(bytes(data)))
         return result
 
-    def pass_encrypt(self, data):
+    def pass_encrypt(self, data, password):
         """
-        Encrypts the given data with the given passphrase.
+        Encrypts the given data with the given password.
 
         :return: output array
         """
@@ -66,8 +27,8 @@ class ToxEncryptSave(util.Singleton):
         tox_err_encryption = c_int()
         self.libtoxencryptsave.tox_pass_encrypt(c_char_p(data),
                                                 c_size_t(len(data)),
-                                                c_char_p(bytes(self._passphrase, 'utf-8')),
-                                                c_size_t(len(self._passphrase)),
+                                                c_char_p(bytes(password, 'utf-8')),
+                                                c_size_t(len(password)),
                                                 out,
                                                 byref(tox_err_encryption))
         tox_err_encryption = tox_err_encryption.value
@@ -81,9 +42,9 @@ class ToxEncryptSave(util.Singleton):
         elif tox_err_encryption == TOX_ERR_ENCRYPTION['FAILED']:
             raise RuntimeError('The encryption itself failed.')
 
-    def pass_decrypt(self, data):
+    def pass_decrypt(self, data, password):
         """
-        Decrypts the given data with the given passphrase.
+        Decrypts the given data with the given password.
 
         :return: output array
         """
@@ -91,8 +52,8 @@ class ToxEncryptSave(util.Singleton):
         tox_err_decryption = c_int()
         self.libtoxencryptsave.tox_pass_decrypt(c_char_p(bytes(data)),
                                                 c_size_t(len(data)),
-                                                c_char_p(bytes(self._passphrase, 'utf-8')),
-                                                c_size_t(len(self._passphrase)),
+                                                c_char_p(bytes(password, 'utf-8')),
+                                                c_size_t(len(password)),
                                                 out,
                                                 byref(tox_err_decryption))
         tox_err_decryption = tox_err_decryption.value

toxygen/toxencryptsave_enums_and_consts.py

@@ -0,0 +1,29 @@
+TOX_ERR_ENCRYPTION = {
+    # The function returned successfully.
+    'OK': 0,
+    # Some input data, or maybe the output pointer, was null.
+    'NULL': 1,
+    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
+    # functions accepting keys do not produce this error.
+    'KEY_DERIVATION_FAILED': 2,
+    # The encryption itself failed.
+    'FAILED': 3
+}
+
+TOX_ERR_DECRYPTION = {
+    # The function returned successfully.
+    'OK': 0,
+    # Some input data, or maybe the output pointer, was null.
+    'NULL': 1,
+    # The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes
+    'INVALID_LENGTH': 2,
+    # The input data is missing the magic number (i.e. wasn't created by this module, or is corrupted)
+    'BAD_FORMAT': 3,
+    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
+    # functions accepting keys do not produce this error.
+    'KEY_DERIVATION_FAILED': 4,
+    # The encrypted byte array could not be decrypted. Either the data was corrupt or the password/key was incorrect.
+    'FAILED': 5,
+}
+
+TOX_PASS_ENCRYPTION_EXTRA_LENGTH = 80

toxygen/toxes.py

@@ -0,0 +1,28 @@
+import util
+import toxencryptsave
+
+
+class ToxES(util.Singleton):
+
+    def __init__(self):
+        super().__init__()
+        self._toxencryptsave = toxencryptsave.ToxEncryptSave()
+        self._passphrase = None
+
+    def set_password(self, passphrase):
+        self._passphrase = passphrase
+
+    def has_password(self):
+        return bool(self._passphrase)
+
+    def is_password(self, password):
+        return self._passphrase == password
+
+    def is_data_encrypted(self, data):
+        return len(data) > 0 and self._toxencryptsave.is_data_encrypted(data)
+
+    def pass_encrypt(self, data):
+        return self._toxencryptsave.pass_encrypt(data, self._passphrase)
+
+    def pass_decrypt(self, data):
+        return self._toxencryptsave.pass_decrypt(data, self._passphrase)

toxygen/util.py

@@ -2,8 +2,9 @@ import os
 import time
 import shutil
 import sys
+import re
 
-program_version = '0.2.6'
+program_version = '0.2.7'
 
 
 def log(data):
@@ -37,7 +38,7 @@ def remove(folder):
 
 
 def convert_time(t):
-    offset = time.timezone - time.daylight * 3600
+    offset = time.timezone + time_offset() * 60
     sec = int(t) - offset
     m, s = divmod(sec, 60)
     h, m = divmod(m, 60)
@@ -45,6 +46,20 @@ def convert_time(t):
     return '%02d:%02d' % (h, m)
 
 
+def time_offset():
+    if hasattr(time_offset, 'offset'):
+        return time_offset.offset
+    hours = int(time.strftime('%H'))
+    minutes = int(time.strftime('%M'))
+    sec = int(time.time()) - time.timezone
+    m, s = divmod(sec, 60)
+    h, m = divmod(m, 60)
+    d, h = divmod(h, 24)
+    result = hours * 60 + minutes - h * 60 - m
+    time_offset.offset = result
+    return result
+
+
 def append_slash(s):
     if len(s) and s[-1] not in ('\\', '/'):
         s += '/'
@@ -55,6 +70,15 @@ def is_64_bit():
     return sys.maxsize > 2 ** 32
 
 
+def is_re_valid(regex):
+    try:
+        re.compile(regex)
+    except re.error:
+        return False
+    else:
+        return True
+
+
 class Singleton:
     _instance = None
 

toxygen/widgets.py

@@ -9,7 +9,7 @@ class DataLabel(QtGui.QLabel):
     Label with elided text
     """
     def setText(self, text):
-        text = ''.join(c if c <= '\U0010FFFF' else '\u25AF' for c in text)
+        text = ''.join('\u25AF' if len(bytes(c, 'utf-8')) >= 4 else c for c in text)
         metrics = QtGui.QFontMetrics(self.font())
         text = metrics.elidedText(text, QtCore.Qt.ElideRight, self.width())
         super().setText(text)