Changeset e4f5ca8

Timestamp:

2013-02-10T12:48:32Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

12f500f, 65a5d15

Parents:

be98957 (diff), 875ba16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos. Adds a "group info" command to list members of a group.

Files:

• configure (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/skype/README (modified) (1 diff)
• protocols/skype/skype.c (modified) (4 diffs)
• protocols/skype/skyped.txt (modified) (1 diff)
• protocols/skype/t/filetransfer-bitlbee.mock (added)
• protocols/skype/t/filetransfer-skyped.mock (added)
• protocols/skype/t/group-read-bitlbee.mock (added)
• protocols/skype/t/group-read-skyped.mock (added)
• protocols/skype/test.py (modified) (1 diff)
• root_commands.c (modified) (1 diff)

configure

@@ -645 +645 @@
 *gcc* )
         echo CFLAGS+=-MMD -MF .depend/\$@.d >> Makefile.settings
-        for i in . lib protocols protocols/*/; do
+        for i in . lib tests protocols protocols/*/; do
                 mkdir -p $i/.depend
         done

doc/user-guide/commands.xml

@@ -1784 +1784 @@
         <bitlbee-command name="group">
                 <short-description>Contact group management</short-description>
-                <syntax>group list</syntax>
-
-                <description>
-                        <para>
-                                Only the <emphasis>group list</emphasis> command is supported at the moment, which shows a list of all groups defined so far.
+                <syntax>group [ list | info &lt;group&gt; ]</syntax>
+
+                <description>
+                        <para>
+                                The <emphasis>group list</emphasis> command shows a list of all groups defined so far.
+                        </para>
+                        
+                        <para>
+                                The <emphasis>group info</emphasis> command shows a list of all members of a the group &lt;group&gt;.
                         </para>
                         

protocols/skype/README

@@ -145 +145 @@
 === Configuring
 
-- Set up `~/.skyped/skyped.conf`: Create the `~/.skyped` directory, copy
-  `skyped.conf` and `skyped.cnf` from
-  `/usr/local/etc/skyped/skyped.conf` to `~/.skyped`, adjust `username`
-  and `password`. The `username` should be your Skype login and the
-  `password` can be whatever you want, but you will have to specify that
-  one when adding the Skype account to BitlBee (see later).
-
-NOTE: Here, and later - `/usr/local/etc` can be different on your installation
-if you used the `--sysconfdir` switch when running bitlbee-skype's `configure`.
-
-- Generate the SSL pem files:
-
-----
-# cd ~/.skyped
-# openssl req -new -x509 -days 365 -nodes -config skyped.cnf -out skyped.cert.pem \
-        -keyout skyped.key.pem
-----
-
-NOTE: Maybe you want to adjust the permissions in the `~/.skyped`
-dir. For example make it readable by just your user.
-
-- Start `skyped` (the tcp server):
-
-----
-$ skyped
-----
-
-- Start your `IRC` client, connect to BitlBee and add your account:
-
-----
-account add skype <user> <pass>
-account skype set server localhost
-----
-
-<user> should be your Skype account name, <pass> should be the one you declared
-in `skyped.conf`. If you want to run skyped on a remote machine, replace
-`localhost` with the name of the machine.
-
-If you are running skyped on a custom port:
-
-----
-account skype set port <port>
-----
-
-If you want to set your full name (optional):
-
-----
-account skype set display_name "John Smith"
-----
-
-If you want to see your skypeout contacts online as well (they are
-offline by default):
-
-----
-account skype set skypeout_offline false
-----
+See the manpage of `skyped`.
 
 == Setting up Skype in a VNC server (optional)

protocols/skype/skype.c

@@ -46 +46 @@
 enum {
         SKYPE_FILETRANSFER_NEW = 1,
+        SKYPE_FILETRANSFER_TRANSFERRING,
+        SKYPE_FILETRANSFER_COMPLETED,
         SKYPE_FILETRANSFER_FAILED
 };
@@ -81 +83 @@
         /* Same for file transfers. */
         int filetransfer_status;
+        /* Path of the file being transferred. */
+        char *filetransfer_path;
         /* Using /j #nick we want to have a groupchat with two people. Usually
          * not (default). */
@@ -783 +787 @@
                         id);
                 sd->filetransfer_status = SKYPE_FILETRANSFER_FAILED;
+        } else if (!strcmp(info, "STATUS COMPLETED")) {
+                skype_printf(ic, "GET FILETRANSFER %s PARTNER_HANDLE\n", id);
+                sd->filetransfer_status = SKYPE_FILETRANSFER_COMPLETED;
+        } else if (!strcmp(info, "STATUS TRANSFERRING")) {
+                skype_printf(ic, "GET FILETRANSFER %s PARTNER_HANDLE\n", id);
+                sd->filetransfer_status = SKYPE_FILETRANSFER_TRANSFERRING;
+        } else if (!strncmp(info, "FILEPATH ", 9)) {
+                info += 9;
+                sd->filetransfer_path = g_strdup(info);
         } else if (!strncmp(info, "PARTNER_HANDLE ", 15)) {
                 info += 15;
@@ -795 +808 @@
                         imcb_log(ic, "Failed to transfer file from user %s.",
                                 info);
+                        break;
+                case SKYPE_FILETRANSFER_COMPLETED:
+                        imcb_log(ic, "File transfer from user %s completed.", info);
+                        break;
+                case SKYPE_FILETRANSFER_TRANSFERRING:
+                        if (sd->filetransfer_path) {
+                                imcb_log(ic, "File transfer from user %s started, saving to %s.", info, sd->filetransfer_path);
+                                g_free(sd->filetransfer_path);
+                                sd->filetransfer_path = NULL;
+                        }
                         break;
                 }

protocols/skype/skyped.txt

@@ -20 +20 @@
 == CONFIGURATION
 
-See the README for information about how to configure this daemon.
+- Set up `~/.skyped/skyped.conf`: Create the `~/.skyped` directory, copy
+  `skyped.conf` and `skyped.cnf` from `/usr/local/etc/skyped/` to `~/.skyped`,
+  adjust `username` and `password`. The `username` should be your Skype login and
+  the `password` can be whatever you want, but you will have to specify that one
+  when adding the Skype account to BitlBee (see later).
+
+NOTE: Here, and later - `/usr/local/etc` can be different on your installation
+if you used the `--sysconfdir` switch when running the `configure` of BitlBee.
+
+- Generate the SSL pem files:
+
+----
+$ cd ~/.skyped
+$ openssl req -new -x509 -days 365 -nodes -config skyped.cnf -out skyped.cert.pem \
+        -keyout skyped.key.pem
+----
+
+- Start `skyped` (the TCP server), initially without detaching and enabling debug messages:
+
+----
+$ skyped -d -n
+----
+
+- Start your `IRC` client, connect to BitlBee and add your account:
+
+----
+account add skype <user> <pass>
+----
+
+`<user>` should be your Skype account name, `<pass>` should be the one you declared
+in `skyped.conf`.
 
 == OPTIONS

protocols/skype/test.py

@@ -97 +97 @@
                 self.mock("called-no")
 
+        def testFiletransfer(self):
+                self.mock("filetransfer")
+
+        def testGroupRead(self):
+                self.mock("group-read")
+
 if __name__ == '__main__':
         unittest.main()

root_commands.c

@@ -1290 +1290 @@
                 }
                 irc_rootmsg( irc, "End of group list" );
+        }
+        else if( g_strncasecmp(cmd[1], "info", len ) == 0 )
+        {
+                bee_group_t *bg;
+                int n = 0;
+
+                MIN_ARGS(2);
+                bg = bee_group_by_name( irc->b, cmd[2], FALSE );
+
+                if( bg )
+                {
+                        if( strchr(irc->umode, 'b') )
+                                irc_rootmsg( irc, "Members of %s:", cmd[2] );
+                        for( l = irc->b->users; l; l = l->next )
+                        {
+                                bee_user_t *bu = l->data;
+                                if( bu->group == bg )
+                                        irc_rootmsg( irc, "%d. %s", n ++, bu->nick ? : bu->handle );
+                        }
+                        irc_rootmsg( irc, "End of member list" );
+                }
+                else
+                        irc_rootmsg( irc, "Unknown group: %s. Please use \x02group list\x02 to get a list of available groups.", cmd[2] );
         }
         else