Merge lp:~strycore/lolz/quickly_trunk into lp:lolz

[Mathieu Comandon]

lolz , now with lolcats again, and it does not fail at getting pictures who fail

[Mathieu Comandon (strycore)]

review: Approve

Unmerged revisions

35. By Mathieu Comandon on 2010-01-20

Fixed retrieval of images from icanhaz and failblog + made Gwibber an option

=== modified file 'bin/lolz'
--- bin/lolz	2009-09-12 18:11:10 +0000
+++ bin/lolz	2010-01-23 21:09:13 +0000
@@ -19,22 +19,27 @@
 import os
 import gtk
 import urllib
+import urllib2
 import datetime
 import random
 import dbus
 import time
+import logging
+import re
 
-#check if gwibber support is installed
+#check if gwibber is wanted and if support is installed
+gwibber_want = False
 gwibber_support = False
-try:
-    import gwibber.config
-    import gwibber.server
-
-    gwibber_support = True
-
-except Exception, inst:
-    logging.debug("Failed to setup dbus connection to gwibber")
-    gwibber_support = False
+if gwibber_want:
+    try:
+        import gwibber.config
+        import gwibber.server
+
+        gwibber_support = True
+
+    except ImportError, inst:
+        logging.debug("Failed to setup dbus connection to gwibber")
+        gwibber_support = False
 
 
 # Check if we are working in the source tree or from the installed 
@@ -48,7 +53,9 @@
     fullPath = os.getcwd()
 sys.path.insert(0, os.path.dirname(fullPath))
 
-from lolz import AboutLolzDialog, PreferencesLolzDialog, MicroblogDialog
+from lolz import AboutLolzDialog, PreferencesLolzDialog
+if gwibber_support:
+    from lolz import MicroblogDialog
 from lolz.lolzconfig import getdatapath
 from lolz.AsynchTaskProgressBox import AsynchTaskProgressBox
 
@@ -129,7 +136,7 @@
         logging.debug('day_selected() called')
         self.calendar.hide()
         d = self.calendar.get_date()
-        display_date = datetime.date(d[0],d[1],d[2])
+        display_date = datetime.date(d[0],d[1]+1,d[2])
         self.builder.get_object("calendar_button").set_label(display_date.isoformat())
 
         #clear out the curren set of images
@@ -251,19 +258,16 @@
 
 
 def __get_fail_images(date):
+    """
+    example url : <img class="mine_3010416640" title="epic-fail-prison-guard-fail" src="http://failblog.files.wordpress.com/2009/12/epic-fail-prison-guard-fail.jpg" alt="epic fail pictures" />
+    """
     html = __get_html_for_date("http://failblog.org/",date)
-
-    mines = html.split("mine_")
-    del(mines[0])
     images = []
-    for m in mines:
-        if m.find("imageid_") > -1:
-            pz = m.split("<img src=\"")
-            url = pz[1].split("\" alt=")[0]
-            if url.find("?") > -1:
-                url = url.split("?")[0]
-            images.append(__download_image(url,"http://failblog.org/","source: failblog.org"))
-
+    fail_re = "[\"\'](http://failblog.files.wordpress.com.*?jpg)[\"\']"
+    pics = re.findall(fail_re,html,re.MULTILINE | re.IGNORECASE)
+    for pic in pics:
+        logging.debug(pic)
+        images.append(__download_image(pic,"http://failblog.org/","source: failblog.org"))
     logging.debug('found fail images:')
     logging.debug(images)
 
@@ -272,44 +276,34 @@
 
 def __get_hotdog_images(date):
     html = __get_html_for_date("http://ihasahotdog.com/",date)
-
-    mines = html.split("mine_")
-    del(mines[0])
+    fail_re = "[\"\'](http://ihasahotdog.files.wordpress.com.*?jpg)[\"\']"
+    pics = re.findall(fail_re,html,re.MULTILINE | re.IGNORECASE)
     images = []
-    for m in mines:
-        if m.find("src") > -1 and m.find("Add this to your blog") == -1:
-            if m.find("src=\"") > -1:
-                pz = m.split("src=\"")
-                if pz[1].find("LJT") == -1 and pz[1].find("imagestore") == -1:
-                    url = pz[1].split("?")[0]
-                    url = url.split("\" alt")[0]
-                    images.append(__download_image(url,"http://ihasahotdog.com/","source: ihasahotdog.com"))
+    for pic in pics:
+        images.append(__download_image(pic,"http://ihasahotdog.com/","source: ihasahotdog.com"))
     logging.debug('found hotdog images:')
     logging.debug(images)
     return images
 
 def __get_html_for_date(url, date):
     logging.debug('getting html from ' + url + ' for ' + str(date))
-    dt_suffix = str(date.year) + "/" + str(date.month + 1) + "/" + str(date.day)
+    dt_suffix = str(date.year) + "/" + str(date.month) + "/" + str(date.day)
     day_url = url + dt_suffix
-    f = urllib.urlopen(day_url)
-    html = f.read()
+    logging.debug(day_url)
+    user_agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.7) Gecko/20100106 Ubuntu/10.04 (lucid) Firefox/3.5.7"
+    headers = { 'User-agent' : user_agent  }
+    request = urllib2.Request(day_url,None,headers)
+    request_content = urllib2.urlopen(request)
+    html = request_content.read()
     return html
             
 def __get_cheez_images(date):
     html = __get_html_for_date("http://icanhascheezburger.com/",date)
-
-    mines = html.split("mine_")
-    if len(mines) < 2:
-        return []
-    del(mines[0])
-    del(mines[1])
     images = []
-    for m in mines:
-        if m.find("src") > -1 and m.find("Add this to your blog") == -1:
-            pz = m.split("src")
-            url = pz[1].split("&quot;")[1]
-            images.append(__download_image(url, "http://icanhascheezburger.com/", "source: icanhascheezburger.com"))
+    pics_re = "\<img.*?(http://icanhascheezburger.files.wordpress.com.*?.jpg)\" alt=\"funny pictures of cats with captions.*?\>"
+    pics = re.findall(pics_re,html,re.MULTILINE | re.IGNORECASE | re.DOTALL)
+    for pic in pics:
+        images.append(__download_image(pic, pic, "source: icanhascheezburger.com"))
     logging.debug('found cheezburger images:')
     logging.debug(images)
     return images
@@ -323,7 +317,9 @@
         os.makedirs(lolz_cache)
     fname = os.path.join(lolz_cache,fname)
     if not os.path.exists(fname):
-        img_stream = urllib.urlopen(url)
+        headers = { 'User-agent' : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.7) Gecko/20100106 Ubuntu/10.04 (lucid) Firefox/3.5.7" }
+        request = urllib2.Request(url,None,headers)
+        img_stream = urllib2.urlopen(request)
         img_file = open(fname,'w')
         img_file.write(img_stream.read())
         img_file.flush()
 
=== modified file 'data/ui/LolzWindow.ui'
--- data/ui/LolzWindow.ui	2009-09-12 18:11:10 +0000
+++ data/ui/LolzWindow.ui	2010-01-23 21:09:13 +0000
@@ -27,50 +27,11 @@
                   <object class="GtkMenu" id="menu1">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem1">
-                        <property name="label">gtk-new</property>
-                        <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem2">
-                        <property name="label">gtk-open</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem3">
-                        <property name="label">gtk-save</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem4">
-                        <property name="label">gtk-save-as</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="label">gtk-quit</property>
+                        <property name="label">'kthxbye</property>
                         <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image1</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="quit"/>
                       </object>
                     </child>
@@ -87,43 +48,6 @@
                   <object class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem6">
-                        <property name="label">gtk-cut</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem7">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem8">
-                        <property name="label">gtk-paste</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem9">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem11">
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
@@ -137,13 +61,6 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <child>
               <object class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
@@ -268,4 +185,8 @@
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
 </interface>
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-09-14 16:02:03 +0000
+++ debian/changelog	2010-01-23 21:09:13 +0000
@@ -1,3 +1,9 @@
+lolz (1.238~public1) lucid; urgency=low
+
+  * New release.
+
+ -- Mathieu Comandon <[e-mail]>  Wed, 20 Jan 2010 22:34:30 +0100
+
 lolz (1.138) karmic; urgency=low
 
   * New release.
 
=== modified file 'debian/control'
--- debian/control	2009-09-10 19:17:03 +0000
+++ debian/control	2010-01-23 21:09:13 +0000
@@ -16,7 +16,7 @@
 Depends: ${misc:Depends},
  ${python:Depends},
  python-dbus,
- python-desktopcouch,
- python-gtk2
+ python-gtk2,
+ python-desktopcouch-records
 Description: I can has lolz
  The least essential application ever
 
=== modified file 'lolz/PreferencesLolzDialog.py'
--- lolz/PreferencesLolzDialog.py	2009-09-12 18:11:10 +0000
+++ lolz/PreferencesLolzDialog.py	2010-01-23 21:09:13 +0000
@@ -17,6 +17,7 @@
 import sys
 import os
 import gtk
+
 from desktopcouch.records.server import CouchDatabase
 from desktopcouch.records.record import Record
 
 
=== modified file 'setup.py'
--- setup.py	2009-09-19 16:38:02 +0000
+++ setup.py	2010-01-23 21:09:13 +0000
@@ -93,10 +93,10 @@
 
 DistUtilsExtra.auto.setup(
     name='lolz',
-    version='1.238',
+    version='1.238~public1',
     license='GPL v3',
-    author='Rick Spencer',
-    author_email='[e-mail]',
+    author='Mathieu Comandon',
+    author_email='[e-mail]',
     description='I can has lolz',
     long_description='The least essential application ever',
     url='https://launchpad.net/lolz',