Torchat py enhancements

torchat/doc/howto_second_instance.html

@@ -11,6 +11,16 @@
   <h1>
    How to run more than on instance of TorChat
   </h1>
+  <p>
+  <span style="color: darkgreen">
+      For <b>torchat_py</b> versions <b>above 0.9.9.553</b>
+      this works out of box.
+      To start second account, add account's name to command line.
+      If you run portable torchat (Windows case), copy distribution
+      to another dir. Make sure not to copy Tor/hidden_service/ directory.
+  </span>
+  </p>
+  <hr/>
   <p>
    <span style="color: #ff0000">This howto will <b>not</b> work with versions <b>below 0.9.9.260</b></span>
   </p>

torchat/src/Tor/tor.sh

@@ -3,5 +3,5 @@
 trap 'kill -15 `cat tor.pid`' 15
 
 export PATH=$PATH:/usr/sbin
-tor -f torrc.txt --PidFile tor.pid &
+tor -f torrc.temp.txt --PidFile tor.pid &
 wait

torchat/src/config.py

@@ -21,6 +21,7 @@
 import inspect
 import translations
 import shutil
+import json
 
 def isWindows():
     return sys.platform.startswith("win")
@@ -29,15 +30,17 @@ def isWindows():
     import ctypes
 
 config_defaults = {
+    ("client", "tor_config") : "tor_portable",
     ("tor", "tor_server") : "127.0.0.1",
     ("tor", "tor_server_socks_port") : 9050,
     ("tor", "tor_server_control_port") : 9051,
     ("tor_portable", "tor_server") : "127.0.0.1",
-    ("tor_portable", "tor_server_socks_port") : 11109,
+    ("tor_portable", "tor_server_socks_port") : 0,
     ("tor_portable", "tor_server_control_port") : 11119,
     ("client", "own_hostname") : "0000000000000000",
     ("client", "listen_interface") : "127.0.0.1",
-    ("client", "listen_port") : 11009,
+    ("client", "listen_port") : 0,
+    ("client", "buddy-list") : '[]',
     ("logging", "log_file") : "",
     ("logging", "log_level") : 0,
     ("files", "temp_files_in_data_dir") : 1,
@@ -66,6 +69,7 @@ def isWindows():
     ("branding", "support_name") : "Bernd, author of TorChat",
     ("profile", "name") : "",
     ("profile", "text") : "",
+    ("plugin", "enabled_plugins") : '',
 }
 
 LOCALE_ENC = locale.getpreferredencoding()
@@ -493,4 +497,26 @@ def main():
     #now switch to the configured translation
     importLanguage()
 
+    if not json.loads(get('client', 'buddy-list')):
+        # backward compatibility with buddy-list.txt
+        filename = os.path.join(getDataDir(), "buddy-list.txt")
+
+        if os.path.exists(filename):
+            f = open(filename)
+            buddy_list = []
+            for line in f:
+                line = line.rstrip().decode("UTF-8")
+                if len(line) > 15:
+                    address = line[0:16]
+                    if len(line) > 17:
+                        name = line[17:]
+                    else:
+                        name = u""
+                    buddy = {'address': address,
+                             'name': name.encode("UTF-8"),
+                             'profile_name': ''}
+                    buddy_list.append(buddy)
+            f.close()
+            set('client', 'buddy-list', json.dumps(buddy_list))
+
 main()

torchat/src/dlg.py

@@ -92,7 +92,8 @@ def getDefault(self, default):
             return default
 
     def setEnabled(self, enabled):
-        self.wx_label.Enable(enabled)
+        if hasattr(self, 'wx_label'):
+            self.wx_label.Enable(enabled)
         if self.wx_ctrl:
             self.wx_ctrl.Enable(enabled)
 

torchat/src/dlg_settings.py

@@ -17,7 +17,6 @@
 import wx
 import dlg
 import config
-import tc_client
 import translations
 lang = translations.lang_en
 
@@ -29,16 +28,16 @@ def __init__(self, main_window):
 
         #1 outer panel and vertical sizer
         self.outer_panel = wx.Panel(self)
-        outer_sizer = wx.BoxSizer(wx.VERTICAL)
-        self.outer_panel.SetSizer(outer_sizer)
+        self.outer_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.outer_panel.SetSizer(self.outer_sizer)
 
         #1.1 the notebook on the top
         self.notebook = wx.Notebook(self.outer_panel)
-        outer_sizer.Add(self.notebook, 1, wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
+        self.outer_sizer.Add(self.notebook, 1, wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
 
         #1.2 the button_sizer at the bottom
         button_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        outer_sizer.Add(button_sizer, 0, wx.ALIGN_RIGHT | wx.ALL, border=5)
+        self.outer_sizer.Add(button_sizer, 0, wx.ALIGN_RIGHT | wx.ALL, border=5)
 
         #1.2.1 cancel button
         btn_cancel = wx.Button(self.outer_panel, wx.ID_CANCEL, lang.BTN_CANCEL)
@@ -57,6 +56,9 @@ def __init__(self, main_window):
         self.p1 = dlg.Panel(self.notebook)
         self.notebook.AddPage(self.p1, lang.DSET_NET_TITLE)
 
+        portable = (self.mw.buddy_list.tor_config == "tor_portable")
+        self.tor_portable = dlg.Check(self.p1, lang.DSET_GUI_TOR_PORTABLE, int(portable))
+
         self.s_tor_portable = dlg.Separator(self.p1, "Tor portable")
         dlg.Text(self.p1, lang.DSET_NET_TOR_ADDRESS, ("tor_portable", "tor_server"), True)
         dlg.Text(self.p1, lang.DSET_NET_TOR_SOCKS, ("tor_portable", "tor_server_socks_port"))
@@ -69,9 +71,7 @@ def __init__(self, main_window):
         dlg.Separator(self.p1, "Client")
         dlg.Text(self.p1, lang.DSET_NET_LISTEN_INTERFACE, ("client", "listen_interface"), True)
         dlg.Text(self.p1, lang.DSET_NET_LISTEN_PORT, ("client", "listen_port"))
-        self.p1.fit()
 
-        portable = (tc_client.TOR_CONFIG == "tor_portable")
         if portable:
             self.s_tor.setEnabled(False)
         else:
@@ -96,20 +96,52 @@ def __init__(self, main_window):
         self.dir_tmp = dlg.Dir(self.p3, lang.DSET_MISC_TEMP_CUSTOM_DIR, ("files", "temp_files_custom_dir"))
         self.dir_tmp.setEnabled(not self.chk_tmp.getValue())
         self.chk_tmp.wx_ctrl.Bind(wx.EVT_CHECKBOX, self.onChkTmp)
-
+
+        #3.4 plugins
+        self.p4 = dlg.Panel(self.notebook)
+        self.notebook.AddPage(self.p4, lang.DSET_PLUGINS_TITLE)
+        self.plugins = {}
+        enabled_plugins = set(config.get('plugin', 'enabled_plugins').split(','))
+        import torchat
+        for plugin_name in sorted(torchat.PLUGINS.keys()):
+            plugin_dscr = getattr(lang, 'DSET_PLUGIN_' + plugin_name.upper(), plugin_name)
+            enabled = int(bool(plugin_name in enabled_plugins))
+            self.plugins[plugin_name] = dlg.Check(self.p4, plugin_dscr, enabled)
+
+        # add plugins' settings
+        self.addPluginSettings(main_window)
+
         #4 fit the sizers
-        outer_sizer.Fit(self)
-
+        self.p1.fit()
+        self.p2.fit()
+        self.p3.fit()
+        self.p4.fit()
+        self.outer_sizer.Fit(self)
+
+    def addPluginSettings(self, main_window):
+        pass
+
     def onChkTmp(self, evt):
         self.dir_tmp.setEnabled(not self.chk_tmp.getValue())
-        
+
     def onCancel(self, evt):
         evt.Skip() #let the frame now process the Cancel event
 
     def onOk(self, evt):
         self.p1.saveAllData()
         self.p2.saveAllData()
         self.p3.saveAllData()
+        #enabled_plugins = set(config.get('plugin', 'enabled_plugins').split(','))
+        import torchat
+        if self.tor_portable.getValue() == 1:
+            config.set('client', 'tor_config', 'tor_portable')
+        else:
+            config.set('client', 'tor_config', 'tor')
+        enabled_plugins = []
+        for plugin_name in torchat.PLUGINS:
+            if self.plugins[plugin_name].getValue():
+                enabled_plugins.append(plugin_name)
+        config.set('plugin', 'enabled_plugins', ','.join(enabled_plugins))
         if self.lang.getValue() != self.lang_old:
             config.importLanguage()
         evt.Skip() #let the frame now process the Ok event

torchat/src/make_debian_package.py

@@ -86,11 +86,13 @@
         "usr/lib/torchat",
         "usr/lib/torchat/SocksiPy",
         "usr/lib/torchat/translations",
+        "usr/lib/torchat/plugins",
         "usr/lib/torchat/Tor",
         ]
 
 files = [("translations/*.py", "usr/lib/torchat/translations"),
          ("translations/*.txt", "usr/lib/torchat/translations"),
+         ("plugins/*", "usr/lib/torchat/plugins"),
          ("icons/*", "usr/share/pixmaps/torchat"),
          ("SocksiPy/__init__.py", "usr/lib/torchat/SocksiPy"),
          ("SocksiPy/socks.py", "usr/lib/torchat/SocksiPy"),

torchat/src/make_release_zip.py

@@ -95,6 +95,8 @@ def zipSrc(zipfile_name):
         "src\\translations\\insert_missing.py",
         "src\\translations\\__init__.py",
 
+        "src\\plugins\\*",
+
         "src\\SocksiPy\\*.py",
         "src\\SocksiPy\\BUGS",
         "src\\SocksiPy\\LICENSE",
@@ -130,6 +132,7 @@ def clean(folder):
 def cleanSrc():
     clean(".")
     clean("translations")
+    clean("plugins")
     clean("SocksiPy")
 
 # ------------------

torchat/src/plugins/add_password.py

@@ -0,0 +1,60 @@
+# -*- coding: UTF-8 -*-
+
+NAME_en = u'Password protection against new contacts'
+NAME_ru = u'Защита паролем от новых контактов'
+
+def load(torchat):
+    def get(option):
+        return torchat.config.get("password", option)
+
+    torchat.config.config_defaults['password', 'password'] = ''
+    torchat.config.config_defaults['password', 'password_tip'] = ''
+
+    _message_execute = torchat.tc_client.ProtocolMsg_message.execute
+    def message_execute(self):
+        if self.buddy and self.buddy not in self.bl.list and get('password'):
+            if get('password') in self.text:
+                self.buddy.sendChatMessage('Good password')
+                self.__class__ = torchat.tc_client.ProtocolMsg_add_me
+                _add_me_execute(self)
+            else:
+                self.buddy.sendChatMessage('Bad password')
+            return # to suppress warning sent by torchat and password passing
+        _message_execute(self)
+    torchat.tc_client.ProtocolMsg_message.execute = message_execute
+
+    _add_me_execute = torchat.tc_client.ProtocolMsg_add_me.execute
+    def add_me_execute(self):
+        if self.buddy and self.buddy not in self.bl.list and get('password'):
+            message = u'Enter password'
+            if get('password_tip'):
+                message += u'. Password tip: %s' % get('password_tip')
+            self.buddy.sendChatMessage(message)
+        else:
+            _add_me_execute(self)
+    torchat.tc_client.ProtocolMsg_add_me.execute = add_me_execute
+
+    def set_tr(lang, option, translation):
+        setattr(torchat.TRANSLATIONS[lang],
+                'DSET_PASSWORD_' + option.upper(), translation)
+    set_tr('en', 'password', u'Password for new contacts')
+    set_tr('ru', 'password', u'Пароль для новых контактов')
+    set_tr('en', 'password_tip', u'Password tip')
+    set_tr('ru', 'password_tip', u'Подсказка о пароле')
+    torchat.config.importLanguage()
+
+    _addPluginSettings = torchat.dlg_settings.Dialog.addPluginSettings
+    def addPluginSettings(self, main_window):
+        _addPluginSettings(self, main_window)
+        def tr(option):
+            attr_name = 'DSET_PASSWORD_' + option.upper()
+            if hasattr(torchat.dlg_settings.lang, attr_name):
+                return getattr(torchat.dlg_settings.lang, attr_name)
+            else:
+                return option
+        def text(self, option):
+            torchat.dlg.Text(self.p3, tr(option),
+                    ("password", option), expand=True)
+        text(self, 'password')
+        text(self, 'password_tip')
+    torchat.dlg_settings.Dialog.addPluginSettings = addPluginSettings