move sat.tools.jid to sat_frontends.tools.jid

frontends/src/jp/base.py

@@ -36,7 +36,7 @@ import argparse
 from gi.repository import GLib, GObject
 from glob import iglob
 from importlib import import_module
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from sat_frontends.bridge.DBus import DBusBridgeFrontend
 from sat.core import exceptions
 import sat_frontends.jp

frontends/src/jp/cmd_profile.py

@@ -23,7 +23,7 @@ and retrieve informations about a profile."""
 from logging import debug, info, error, warning
 from sat.core.i18n import _
 from sat_frontends.jp import base
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 
 __commands__ = ["Profile"]
 

frontends/src/primitivus/chat.py

@@ -27,7 +27,7 @@ from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePriv
 from sat_frontends.primitivus import xmlui
 from sat_frontends.primitivus.constants import Const as C
 import time
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class ChatText(urwid.FlowWidget):

frontends/src/primitivus/contact_list.py

@@ -22,7 +22,7 @@ import urwid
 from urwid_satext import sat_widgets
 from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
 from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from sat_frontends.primitivus.status import StatusBar
 from sat_frontends.primitivus.constants import Const
 
@@ -79,7 +79,7 @@ class ContactList(urwid.WidgetWrap, QuickContactList):
 
     def setFocus(self, text, select=False):
         """give focus to the first element that matches the given text. You can also
-        pass in text a sat.tools.jid.JID (it's a subclass of unicode).
+        pass in text a sat_frontends.tools.jid.JID (it's a subclass of unicode).
         @param text: contact group name, contact or muc userhost, muc private dialog jid
         @param select: if True, the element is also clicked
         """

frontends/src/primitivus/primitivus

@@ -38,7 +38,7 @@ from sat_frontends.primitivus.progress import Progress
 from sat_frontends.primitivus.notify import Notify
 from sat_frontends.tools.misc import InputHistory
 from sat_frontends.constants import Const as commonConst # FIXME
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from os.path import join
 
 

frontends/src/primitivus/profile_manager.py

@@ -21,7 +21,7 @@ from sat.core.i18n import _
 from sat_frontends.primitivus.constants import Const as C
 import urwid
 from urwid_satext.sat_widgets import AdvancedEdit, Password, List, InputDialog, ConfirmDialog, Alert
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 
 
 class ProfileManager(urwid.WidgetWrap):

frontends/src/quick_frontend/constants.py

@@ -22,4 +22,4 @@ from sat_frontends import constants
 
 class Const(constants.Const):
 
-    PRIVATE_PREFIX = "@PRIVATE@"
+    PRIVATE_PREFIX = "@private@"

frontends/src/quick_frontend/quick_app.py

@@ -21,7 +21,7 @@ from sat.core.i18n import _
 import sys
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from sat_frontends.bridge.DBus import DBusBridgeFrontend
 from sat.core import exceptions
 from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate

frontends/src/quick_frontend/quick_card_game.py

@@ -19,7 +19,7 @@
 
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 

frontends/src/quick_frontend/quick_chat.py

@@ -20,7 +20,7 @@
 from sat.core.i18n import _
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from sat_frontends.quick_frontend.quick_utils import unescapePrivate
 from sat_frontends.quick_frontend.constants import Const
 

frontends/src/quick_frontend/quick_chat_list.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class QuickChatList(dict):

frontends/src/quick_frontend/quick_contact_management.py

@@ -20,7 +20,7 @@
 from sat.core.i18n import _
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class QuickContactManagement(object):

frontends/src/quick_frontend/quick_utils.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from os.path import exists, splitext
 from sat_frontends.quick_frontend.constants import Const
 

frontends/src/tools/jid.py

@@ -0,0 +1,48 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# SAT: a jabber client
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Jérôme Poisson (goffi@goffi.org)
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+class JID(unicode):
+    """This class help manage JID (Node@Domaine/Resource)"""
+
+    def __new__(cls, jid):
+        self = unicode.__new__(cls, jid)
+        self.__parse()
+        return self
+
+    def __parse(self):
+        """find node domain and resource"""
+        node_end = self.find('@')
+        if node_end < 0:
+            node_end = 0
+        domain_end = self.find('/')
+        if domain_end < 1:
+            domain_end = len(self)
+        self.node = self[:node_end]
+        self.domain = self[(node_end + 1) if node_end else 0:domain_end]
+        self.resource = self[domain_end + 1:]
+        if not node_end:
+            self.bare = self
+        else:
+            self.bare = self.node + '@' + self.domain
+
+    def is_valid(self):
+        """return True if the jid is xmpp compliant"""
+        #TODO: implement real check, according to RFCs
+        return self.domain != ""

frontends/src/wix/chat.py

@@ -25,7 +25,7 @@ import os.path
 import time
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from sat_frontends.quick_frontend.quick_chat import QuickChat
 from sat_frontends.wix.contact_list import ContactList
 from sat_frontends.wix.card_game import CardPanel

frontends/src/wix/contact_list.py

@@ -24,7 +24,7 @@ from sat_frontends.wix.constants import Const
 from sat.core.log import getLogger
 log = getLogger(__name__)
 from cgi import escape
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from os.path import join
 
 

frontends/src/wix/main_window.py

@@ -29,7 +29,7 @@ from sat_frontends.wix import xmlui
 from sat_frontends.wix.profile import Profile
 from sat_frontends.wix.profile_manager import ProfileManager
 import os.path
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from sat.core.log import getLogger
 log = getLogger(__name__)
 from sat_frontends.wix.constants import Const

frontends/src/wix/profile.py

@@ -22,7 +22,7 @@ import wx
 import pdb
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class Profile(wx.Frame):

frontends/src/wix/quiz_game.py

@@ -25,7 +25,7 @@ import os.path, glob
 import pdb
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from time import time
 from math import sin, cos, pi