--- urlwatch	2009-08-14 01:47:46.457960865 +0200

+++ urlwatch_xmpp	2009-08-14 15:46:25.881464617 +0200

@@ -55,6 +55,7 @@

 cache_dir = os.path.join(urlwatch_dir, 'cache')

 scripts_dir = os.path.join(urlwatch_dir, 'lib')

 hooks_py = os.path.join(scripts_dir, 'hooks.py')

+xmpp_txt = os.path.join(urlwatch_dir, 'xmpp.txt')

 # Check if we are installed in the system already

 (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))

@@ -141,8 +142,10 @@

     parser.add_option('', '--urls', dest='urls', metavar='FILE', help='Read URLs from the specified file')

     parser.add_option('', '--hooks', dest='hooks', metavar='FILE', help='Use specified file as hooks.py module')

     parser.add_option('-e', '--display-errors', action='store_true', dest='display_errors', help='Include HTTP errors (404, etc..) in the output')

+    parser.add_option('-x', '--xmpp', action='store_true', dest='xmpp', help='Send a message to XMPP clients')

+    parser.add_option('', '--xmpp-file', dest='xmpp_file', metavar='FILE', help='Read XMPP login data and recipients from [FILE] instead')

-    parser.set_defaults(verbose=False, display_errors=False)

+    parser.set_defaults(verbose=False, display_errors=False, xmpp=False)

     (options, args) = parser.parse_args(sys.argv)

@@ -176,6 +179,9 @@

             log.error('%s is not a file' % options.hooks)

             print 'Error: %s is not a file' % options.hooks

             sys.exit(1)

+    

+    if options.xmpp_file:

+        options.xmpp = True

     # Created all needed folders

     for needed_dir in (urlwatch_dir, cache_dir, scripts_dir):

@@ -201,6 +207,52 @@

         if not options.hooks and os.path.exists(hooks_py_example) and not os.path.exists(hooks_py_fn):

             shutil.copy(hooks_py_example, hooks_py_fn)

         sys.exit(1)

+    

+    if options.xmpp:

+        try:

+            import xmpp

+        except ImportError:

+            log.error('python-xmpp not installed')

+            print 'Error: You need python-xmpp installed to use the -x switch'

+            sys.exit(1)

+        

+        if options.xmpp_file:

+            if os.path.isfile(options.xmpp_file):

+                xmpp_txt = options.xmpp_file

+                log.info('using %s as xmpp.txt' % xmpp_txt)

+            else:

+                log.error('no such file: %s' % options.xmpp_file)

+                print 'Error: There is no such file: %s' % options.xmpp_file

+                sys.exit(1)

+        

+        try:

+            xmpp_filehandle = open(xmpp_txt, 'r')            

+        except IOError:

+            log.error('No xmpp.txt file')

+            print 'Error: You need to create a xmpp.txt file first.'

+            print ''

+            print 'Place it in %s' % os.path.dirname(xmpp_txt)

+            print ''

+            print ''

+            print 'Syntax is:'

+            print ''

+            print '\tsender-username@server.tld senderpassword'

+            print '\tfirst-recipient@jabberserver1.tld'

+            print '\tsecond-recipient@jabberserver2.tld'

+            print '\tthird-recipient@foobarserver.tld'

+            print '\t...'

+            print ''

+            sys.exit(1)

+        

+        xmpp_lines = xmpp_filehandle.readlines()

+        xmpp_filehandle.close()

+        for i in xrange(len(xmpp_lines)):

+            xmpp_lines[i] = xmpp_lines[i].strip("\n")

+        (xmpp_from, xmpp_pass) = xmpp_lines[0].split(' ')

+        xmpp_to = []

+        for i in xrange(1, len(xmpp_lines)):

+            xmpp_to.append(xmpp_lines[i])

+        log.info('using %s to send status messages to %s' % (xmpp_from, xmpp_to))            

     headers = {

             'User-agent': user_agent,

@@ -277,18 +329,36 @@

     end = datetime.datetime.now()

     # Output everything

-    if len(summary) > 1:

+    if len(summary) > 0:

         log.info('printing summary with %d items' % len(summary))

         print '-'*line_length

         print 'summary: %d changes' % (len(summary),)

         print ''

+        msg = ''

         for id, line in enumerate(summary):

             print '%02d. %s' % (id+1, line)

+            msg += "\n" + '%02d. %s' % (id+1, line)

         print '-'*line_length

         print '\n\n\n'

+        

+        if (options.xmpp):

+            try:

+                (xmpp_user, xmpp_server) = xmpp_from.split('@')

+                client = xmpp.Client(xmpp_server)

+                client.connect(server=(xmpp_server,5223))

+                client.auth(xmpp_user, xmpp_pass, 'urlwatch')

+                client.sendInitPresence()

+                for to in xmpp_to:

+                    message = xmpp.Message(to, msg)

+                    message.setAttr('type', 'chat')

+                    client.send(message)

+            except:

+                log.error('Could not send message to %s' % xmpp_to)

+                print 'Error: Could not send message to %s' % xmpp_to

+            

     else:

         log.info('summary is too short - not printing')

-    if len(details) > 1:

+    if len(details) > 1 and not options.xmpp:

         log.info('printing details with %d items' % len(details))

         print '\n'.join(details)

         print '-- '