juick. store nicks and ids in the sqlite3 db

juick/manifest.ini

@@ -1,9 +1,8 @@
 [info]
 name: Juick
 short_name: Juick
-version: 0.3
+version: 0.4
 description: Clickable juick links , juick nics, preview juick picturs.
  The key combination alt + up in the textbox allow insert the number of last message (comment or topic).
 authors: Denis Fomin <fominde@gmail.com>, evgen <drujebober@gmail.com>
 homepage: http://trac-plugins.gajim.org/wiki/JuickPlugin
-

juick/plugin.py

@@ -9,6 +9,7 @@ import urllib
 from string import upper
 from string import rstrip
 import locale
+import sqlite3
 
 from common import helpers
 from common import gajim
@@ -65,6 +66,11 @@ class JuickPlugin(GajimPlugin):
         self.chat_control = chat_control
         control = Base(self, self.chat_control)
         self.controls.append(control)
+        self.conn = sqlite3.connect(os.path.join(self.cache_path, 'juick_db'))
+        self.conn.execute('create table if not exists person'
+            '(nick, id, last_modified)')
+        self.conn.commit()
+        self.cursor = self.conn.cursor()
 
     @log_calls('JuickPlugin')
     def disconnect_from_chat_control(self, chat_control):
@@ -185,8 +191,8 @@ class Base(object):
         self.chat_control.handlers[id_] = self.tag_button
         self.tag_button.set_no_show_all(True)
         self.tag_button.set_tooltip_text(_('Juick tags'))
-        self.tag_button.set_property('visible',
+        self.tag_button.set_property('visible', self.plugin.config[
-                                        self.plugin.config['SHOW_TAG_BUTTON'])
+            'SHOW_TAG_BUTTON'])
 
     def create_link_menu(self):
         """
@@ -234,7 +240,7 @@ class Base(object):
         for num in xrange(1, 11):
             menuitem = self.plugin.config['MENUITEM' + str(num)]
             text = self.plugin.config['MENUITEM_TEXT' + str(num)]
-            if menuitem == '' or text == '':
+            if not menuitem or not text:
                 continue
             item = gtk.MenuItem(menuitem)
             item.connect('activate', self.on_insert, text)
@@ -305,24 +311,41 @@ class Base(object):
             return
         if gajim.interface.juick_nick_re.match(special_text):
             # insert juick nick @nickname////
-            buffer_, iter_, tag = self.get_iter_and_tag('juick_nick')
-            mark = buffer_.create_mark(None, iter_, True)
-            # insert juick nick
-            buffer_.insert_with_tags(iter_, special_text, tag)
             if not self.plugin.config['SHOW_AVATARS']:
                 return
+            buffer_, iter_, tag = self.get_iter_and_tag('juick_nick')
+            mark = buffer_.create_mark(None, iter_, True)
+            nick = special_text[1:].rstrip(':')
+            # insert juick nick
+            buffer_.insert_with_tags(iter_, special_text, tag)
             # insert avatars
             conn = gajim.connections[self.chat_control.account]
             if not conn.connected:
                 return
+            # search id in the db
+            query = "select nick, id from person where nick = :nick"
+            self.plugin.cursor.execute(query, {'nick':nick})
+            db_item = self.plugin.cursor.fetchone()
+            if db_item:
+                # nick in the db
+                pixbuf = self.get_avatar(db_item[1], nick, True)
+                if not pixbuf:
+                    return
+                end_iter = buffer_.get_iter_at_mark(mark)
+                anchor = buffer_.create_child_anchor(end_iter)
+                img = TextViewImage(anchor, nick)
+                img.set_from_pixbuf(pixbuf)
+                img.show()
+                self.textview.tv.add_child_at_anchor(img, anchor)
+            else:
+                # nick not in the db
                 id_ = conn.connection.getAnID()
                 to = 'juick@juick.com'
                 iq = common.xmpp.Iq('get', to=to)
                 a = iq.addChild(name='query',
                     namespace='http://juick.com/query#users')
-            special_text1 = special_text[1:].rstrip(':')
                 a.addChild(name='user', namespace='http://juick.com/user',
-                attrs={'uname': special_text1})
+                    attrs={'uname': nick})
                 iq.setID(id_)
                 conn.connection.SendAndCallForResponse(iq, self._on_response,
                     {'mark': mark, 'special_text': special_text})
@@ -335,8 +358,8 @@ class Base(object):
             buffer_.insert_with_tags(iter_, special_text, tag)
             uid = special_text.split('/')[-1]
             url = "http://i.juick.com/photos-512/%s" % uid
-            pixbuf = self.get_pixbuf_from_url(
+            pixbuf = self.get_pixbuf_from_url( url, self.plugin.config[
-                                    url, self.plugin.config['PREVIEW_SIZE'])
+                'PREVIEW_SIZE'])
             if pixbuf:
                 # insert image
                 buffer_ = mark.get_buffer()
@@ -361,36 +384,54 @@ class Base(object):
         buffer_ = mark.get_buffer()
         end_iter = buffer_.get_iter_at_mark(mark)
         tags = resp.getTag('query')
+        nick = kwargs['special_text'][1:].rstrip(':')
         if tags:
             user = tags.getTag('user')
             if not user:
                 return
             uid = user.getAttr('uid')
-            pixbuf = self.get_avatar(uid)
+            pixbuf = self.get_avatar(uid, nick)
             if pixbuf:
                 anchor = buffer_.create_child_anchor(end_iter)
-                tooltype_text = kwargs['special_text'][1:].rstrip(':')
+                img = TextViewImage(anchor, nick)
-                img = TextViewImage(anchor, tooltype_text)
                 img.set_from_pixbuf(pixbuf)
                 img.show()
                 self.textview.tv.add_child_at_anchor(img, anchor)
 
-    def get_avatar(self, uid):
+
+
+    def get_avatar(self, uid, nick, need_check=None):
         # search avatar in cache or download from juick.com
         pic = uid + '.png'
         pic_path = os.path.join(self.plugin.cache_path, pic)
         pic_path = pic_path.decode(locale.getpreferredencoding())
-        if os.path.isfile(pic_path):
-            pixbuf = gtk.gdk.pixbuf_new_from_file(pic_path)
-            max_old = self.plugin.config['avatars_old']
-            if (time.time() - os.stat(pic_path).st_mtime) < max_old:
-                return pixbuf
         url = 'http://i.juick.com/as/%s.png' % uid
+        if need_check and os.path.isfile(pic_path):
+            max_old = self.plugin.config['avatars_old']
+            #req = urllib2.Request(url)
+            #url_handle = urllib2.urlopen(req)
+            #headers = url_handle.info()
+            #etag = headers.getheader("ETag")
+            #last_modified = headers.getheader("Last-Modified")
+            #return gtk.gdk.pixbuf_new_from_file(pic_path)
+            if (time.time() - os.stat(pic_path).st_mtime) < max_old:
+                return gtk.gdk.pixbuf_new_from_file(pic_path)
+
         pixbuf = self.get_pixbuf_from_url(url,self.plugin.config[
             'AVATAR_SIZE'])
         if pixbuf:
             # save to cache
             pixbuf.save(pic_path, 'png')
+            if need_check:
+                return pixbuf
+            query = "select nick, id from person where nick = :nick"
+            self.plugin.cursor.execute(query, {'nick':nick})
+            db_item = self.plugin.cursor.fetchone()
+            if not db_item:
+                data = (nick.decode('utf-8'), uid.decode('utf-8'))
+                self.plugin.cursor.execute('insert into person(nick, id)'
+                    ' values (?, ?)', data)
+                self.plugin.conn.commit()
             return pixbuf
 
     def get_pixbuf_from_url(self, url, size):
@@ -553,8 +594,7 @@ class JuickPluginConfigDialog(GajimPluginConfigDialog):
             'config_dialog.ui')
         self.xml = gtk.Builder()
         self.xml.set_translation_domain('gajim_plugins')
-        self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
+        self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['vbox1'])
-                ['vbox1'])
         self.checkbutton = self.xml.get_object('checkbutton')
         self.avatar_size_spinbutton = self.xml.get_object('avatar_size')
         self.avatar_size_spinbutton.get_adjustment().set_all(20, 10, 32, 1,
@@ -578,12 +618,12 @@ class JuickPluginConfigDialog(GajimPluginConfigDialog):
         self.avatar_size_spinbutton.set_value(self.plugin.config['AVATAR_SIZE'])
         self.avatars_old.set_value(self.plugin.config['avatars_old'] / 86400)
         self.show_pic.set_active(self.plugin.config['SHOW_PREVIEW'])
-        self.preview_size_spinbutton.set_value(
+        self.preview_size_spinbutton.set_value(self.plugin.config[
-                                            self.plugin.config['PREVIEW_SIZE'])
+            'PREVIEW_SIZE'])
         self.link_colorbutton.set_color(gtk.gdk.color_parse(
             self.plugin.config['LINK_COLOR']))
-        self.xml.get_object('show_tag_button').set_active(
+        self.xml.get_object('show_tag_button').set_active(self.plugin.config[
-                                        self.plugin.config['SHOW_TAG_BUTTON'])
+            'SHOW_TAG_BUTTON'])
         for num in xrange(1, 11):
             self.xml.get_object('menuitem' + str(num)).set_text(
                 self.plugin.config['MENUITEM' + str(num)])