Merge lp:~julien-spautz/cable/refactor-controllers into lp:cable

[Julien Spautz]

=== modified file 'src/Controllers/Channel.vala'
--- src/Controllers/Channel.vala	2013-09-28 18:13:07 +0000
+++ src/Controllers/Channel.vala	2013-10-06 15:45:28 +0000
@@ -43,15 +43,6 @@
     }
 
     void load_state () {
-        /*if (backend.joined) {
-            view.room.state = Widgets.Room.State.CHAT;
-            FIXME some bug in maki returns garbage here:
-            -> view.room.list_users (backend.nicks, backend.prefixes);
-            backend.event_topic (backend.topic, "");
-        } else {
-            view.room.state = Widgets.Room.State.JOINING;
-        }*/
-        // part and rejoin to workaround bug
         view.state = State.JOINING;
 
         if (server.backend.connected == false) {
@@ -67,21 +58,10 @@
         }
     }
 
-    // GUI signals
     void connect_frontend_signals () {
-        view.part.connect (() => {
-            backend.send_part ();
-        });
-
-        server.window.view.selected.connect ((item) => {
-            if (item == view)
-                view.unread_messages = 0;
-        });
-
-        view.join.connect (() => {
-            view.state = State.JOINING;
-            backend.send_join ();
-        });
+        view.part.connect (part_channel);
+        view.join.connect (start_joining);
+        view.private_chat_requested.connect (open_new_private_chat_and_select);
 
         view.send_message.connect ((message) => {
             if (message.has_prefix ("/"))
@@ -98,14 +78,23 @@
             return false;
         });
 
-        view.private_chat_requested.connect ((name) => {
-            server.open_new_chat_with (name);
-            if (server.private_chats.has_key (name))
-                server.window.view.current_chat = server.private_chats [name].view;
-        });
-    }
+    }
+    
+    void part_channel () {
+        backend.send_part ();
+    }
+    
+    void start_joining () {
+        view.state = State.JOINING;
+        backend.send_join ();
+    }
+    
+    void open_new_private_chat_and_select (string name) {
+        server.open_new_chat_with (name);
+        if (server.private_chats.has_key (name))
+            server.window.view.current_chat = server.private_chats [name].view;
+    } 
 
-    // IRC signals
     void connect_backend_signals () {
         backend.event_message.connect ((from, message) => {
             if (server.window.view.current_chat != view)
@@ -128,12 +117,8 @@
             if (!view.has_user (name))
                 return;
 
-            if (name.has_prefix ("@"))
-                view.rename_user (name.replace ("@", ""), new_nick, UserType.OPERATOR);
-            else if (name.has_prefix ("+"))
-                view.rename_user (name.replace ("+", ""), new_nick, UserType.VOICED);
-            else
-                view.rename_user (name, new_nick, UserType.REGULAR);
+            var type = remove_prefix_and_get_type (ref name);
+            view.rename_user (name, new_nick, type);
         });
 
         backend.event_part.connect ((from, message) => {
@@ -141,13 +126,8 @@
                view.state = State.NOT_JOINED;
             } else {
                 var name = from.split ("!")[0];
-
-                if (name.has_prefix ("@"))
-                    view.remove_user (name.replace ("@", ""), message);
-                else if (name.has_prefix ("+"))
-                    view.remove_user (name.replace ("+", ""), message);
-                else
-                    view.remove_user (name, message);
+                remove_prefix_and_get_type (ref name);
+                view.remove_user (name, message);
             }
         });
 
@@ -156,13 +136,8 @@
                 view.state = State.CHAT;
             } else {
                 var name = from.split ("!")[0];
-
-                if (name.has_prefix ("@"))
-                    view.add_user (name.replace ("@", ""), UserType.OPERATOR);
-                else if (name.has_prefix ("+"))
-                    view.add_user (name.replace ("+", ""), UserType.VOICED);
-                else
-                    view.add_user (name, UserType.REGULAR);
+                var type = remove_prefix_and_get_type (ref name);
+                view.add_user (name, type);
             }
         });
 
@@ -189,11 +164,25 @@
 
         backend.event_action.connect ((from, message) => {
             var nick = from.split ("!")[0];
-            view.message ("", "* " + nick + " " + message, MessageType.ACTION);
+            view.message ("", @"*$nick $message*", MessageType.ACTION);
         });
 
         backend.event_names.connect (view.list_users);
     }
+    
+    UserType remove_prefix_and_get_type (ref string nick) {
+        if (name.has_prefix ("@")) {
+            name.replace ("@", "");
+            return UserType.OPERATOR;
+        }
+       
+        if (name.has_prefix ("+")) {
+            name.replace ("+", "");
+            return UserType.VOICED;
+        }
+        
+        return UserType.REGULAR;
+    }
 
     void send_command (string command) {
 

=== modified file 'src/Controllers/PrivateChat.vala'
--- src/Controllers/PrivateChat.vala	2013-09-28 18:13:07 +0000
+++ src/Controllers/PrivateChat.vala	2013-10-06 15:45:28 +0000
@@ -40,7 +40,6 @@
     void connect_signals () {
         server.backend.event_message.connect (display_message_and_notify);
         view.send_message.connect (send_message_and_display);
-        server.window.view.selected.connect (clear_unread_messages);
     }
     
     void display_message_and_notify (string from, string target, string message) {
@@ -70,11 +69,6 @@
         view.entry = "";
     }
     
-    void clear_unread_messages (Port.View.Chat chat) {
-        if (chat == view)
-            view.unread_messages = 0;
-    }
-    
     bool is_not_me (string nick) {
         return nick != server.nick;
     }

=== modified file 'src/Controllers/Window.vala'
--- src/Controllers/Window.vala	2013-09-28 18:13:07 +0000
+++ src/Controllers/Window.vala	2013-10-06 15:45:28 +0000
@@ -29,17 +29,13 @@
 
     public Window (Port.View.Window window, Port.Irc.Session session) {
         GLib.Object (view: window, backend: session);
-
-        connect_frontend_signals ();
-        connect_backend_signals ();
+        connect_signals ();
         initialize ();
     }
 
-    // restore saved state
     void initialize () {
         var channels = Settings.preferences.channels;
 
-        // check for channels from last session
         if (channels.length > 0) {
             foreach (var channel in channels) {
                 var parts = channel.split (":");
@@ -52,80 +48,45 @@
             view.welcome_shown = true;
     }
 
-    // backend events that affect the window's state
-    void connect_backend_signals () {
-        /*Irc.client.event_nick.connect ((time, server, from, nick) => {
-            var current_chat = view.current_chat;
-            var current_server = view.current_server;
-
-            if (server == current_server.id)
-                view.title = string.join (" — ", current_chat.name, nick);
-        });*/
-    }
-
-    // frontend signals from the window
-    void connect_frontend_signals () {
-        view.selected.connect ((item) => {
-            if (item is Port.View.Channel) {
-                var channel = item as Port.View.Channel;
-                view.title = string.join (" — ", channel.name);
-                Settings.preferences.last_used_nick = channel.nick;
-            }
-        });
-
-        view.join.connect ((a,n,c) => {
-            join_channel (a,n,c);
-        });
-
-        view.remove_channel.connect (() => {
-            var channel_id = view.current_chat.id;
-            var server_id = view.current_server.id;
-
-            if (view.current_chat == null) {
-                warning ("No channel selected, cannot leave.");
-            } else if (view.current_chat is Port.View.Channel) {
-                part_channel (servers[server_id].channels[channel_id]);
-            } else if (view.current_chat is Port.View.PrivateChat) {
-                var channel = servers[server_id].private_chats[channel_id];
-                var server = channel.server;
-                server.view.remove_chat (channel.view.id);
-                server.private_chats.unset (channel.view.id);
-
-                if (server.channels.size == 0)
-                    servers.unset (server.view.id);
-
-                if (servers.size == 0) {
-                    view.title = App.TITLE;
-                    view.welcome_shown = true;
-                }
-            }
-        });
-
-        view.add_channel.connect (() => {
-            var dialog = new Dialogs.JoinChannel ();
-            dialog.done.connect ((a,b,c) => join_channel (a.address,b.nick_name,c));
-            dialog.show_all ();
-        });
-
-        view.show_preferences.connect (() => {
-            var dialog = new Dialogs.Preferences ();
-            dialog.show_all ();
-        });
-
-        view.close.connect (() => {
-            string[] chans = {};
-
-            foreach (var server in servers.values) {
-                foreach (var channel in server.channels.values) {
-                    chans += string.join (":", server.address, server.nick, channel.name);
-                    channel.backend.send_part ();
-                }
-            }
-
-            Settings.preferences.channels = chans;
-        });
-    }
-
+    void connect_signals () {
+        view.selected.connect (set_window_title_on_chat_switched);
+        view.join.connect (join_channel);
+        view.remove_channel.connect (remove_chat);
+        view.add_channel.connect (show_join_dialog);
+        view.show_preferences.connect (show_preferences_dialog);
+        view.close.connect (part_all_channels_and_update_settings);
+    }
+    
+    void set_window_title_on_chat_switched (Port.View.Chat chat) {
+        view.title = chat.name;
+        Settings.preferences.last_used_nick = chat.nick;
+        chat.unread_messages = 0;
+    }
+    
+    void part_all_channels_and_update_settings () {
+        string[] chans = {};
+
+        foreach (var server in servers.values) {
+            foreach (var channel in server.channels.values) {
+                chans += string.join (":", server.address, server.nick, channel.name);
+                channel.backend.send_part ();
+            }
+        }
+
+        Settings.preferences.channels = chans;
+    }
+    
+    void show_preferences_dialog () {
+        var dialog = new Dialogs.Preferences ();
+        dialog.show_all ();
+    }
+    
+    void show_join_dialog () {
+        var dialog = new Dialogs.JoinChannel ();
+        dialog.done.connect ((a,b,c) => join_channel (a.address,b.nick_name,c));
+        dialog.show_all ();
+    }
+    
     void join_channel (string address, string nick, string channel_name) {
         Server server = null;
         foreach (var s in servers.values)
@@ -148,16 +109,32 @@
         view.current_chat = channel.view;
         view.welcome_shown = false;
     }
-
-    void part_channel (Channel channel) {
-        var server = channel.server;
-
-        channel.backend.send_part ();
-        server.view.remove_chat (channel.view.id);
-        server.channels.unset (channel.view.id);
-
-        if (server.channels.size == 0)
+    
+    void remove_chat () {
+        var channel_id = view.current_chat.id;
+        var server_id = view.current_server.id;
+
+        Server server = null;
+
+        if (view.current_chat == null) {
+            warning ("No channel selected, cannot leave.");
+        } else if (view.current_chat is Port.View.Channel) {
+            var channel = servers[server_id].channels[channel_id];
+            server = channel.server;
+            channel.backend.send_part ();
+            server.view.remove_chat (channel.view.id);
+            server.channels.unset (channel.view.id);
+        } else if (view.current_chat is Port.View.PrivateChat) {
+            var channel = servers[server_id].private_chats[channel_id];
+            server = channel.server;
+            server.view.remove_chat (channel.view.id);
+            server.private_chats.unset (channel.view.id);
+        }
+        
+        if (server.channels.size == 0 && server.private_chats.size == 0) {
             servers.unset (server.view.id);
+            view.remove_server (server.view.id);
+        }
 
         if (servers.size == 0) {
             view.title = App.TITLE;

=== modified file 'src/Ports/Irc.vala'
--- src/Ports/Irc.vala	2013-09-28 18:13:07 +0000
+++ src/Ports/Irc.vala	2013-10-06 15:45:28 +0000
@@ -15,10 +15,10 @@
         public abstract string name { get; set; }
         public abstract bool away { get; }
         public abstract bool connected { get; }
-        public abstract string[] channel_names { owned get; }
-        public abstract string[] supported_prefixes { owned get; }
-        public abstract string supported_channel_types { owned get; }
-        public abstract string[] ignores { owned get; }
+        //public abstract string[] channel_names { owned get; }
+        //public abstract string[] supported_prefixes { owned get; }
+        //public abstract string supported_channel_types { owned get; }
+        //public abstract string[] ignores { owned get; }
 
         public signal void event_away ();
         public signal void event_away_message (string nick, string message);
@@ -43,17 +43,17 @@
         public abstract void send_connect ();
         public abstract void send_ignore (string pattern);
         public abstract void send_message (string target, string message);
-        public abstract void send_mode (string target, string mode);
+        //public abstract void send_mode (string target, string mode);
         public abstract void send_nick (string nick);
-        public abstract void send_nickserv ();
+        //public abstract void send_nickserv ();
         public abstract void send_notice (string target, string message);
-        public abstract void send_oper (string name, string password);
+        //public abstract void send_oper (string name, string password);
         public abstract void send_part (string channel, string? message = null);
         public abstract void send_quit (string? message = null);
         public abstract void send_raw (string command);
         public abstract void send_unignore (string pattern);
-        public abstract void send_who (string mask, bool operators_only);
-        public abstract void send_whois (string mask);
+        //public abstract void send_who (string mask, bool operators_only);
+        //public abstract void send_whois (string mask);
 
         public abstract bool is_me (string nick);
     }
@@ -80,16 +80,16 @@
         public signal void event_no_such ();
 
         public abstract void send_action (string message);
-        public abstract void send_invite (string who);
+        //public abstract void send_invite (string who);
         public abstract void send_join (string key = "");
         public abstract void send_kick (string who, string message);
-        public abstract void send_list ();
+        //public abstract void send_list ();
         public abstract void send_message (string message);
         public abstract void send_names ();
         public abstract void send_part (string? message = null);
         public abstract void send_topic (string topic = "");
 
-        public abstract string user_channel_mode (string nick);
-        public abstract string user_channel_prefix (string nick);
+        //public abstract string user_channel_mode (string nick);
+        //public abstract string user_channel_prefix (string nick);
     }
 }