From b54e38d5d0802545aa346f14da9a8885eed85288 Mon Sep 17 00:00:00 2001
From: anekos
Date: Mon, 2 Jul 2012 03:32:55 +0900
Subject: Add :sbmother command instead of -url option.

---
 direct_bookmark.js | 154 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 86 insertions(+), 68 deletions(-)

diff --git a/direct_bookmark.js b/direct_bookmark.js
index fbb9349..fe14501 100644
--- a/direct_bookmark.js
+++ b/direct_bookmark.js
@@ -718,13 +718,14 @@ for Migemo search: require XUL/Migemo Extension
             }).join('<br />');
             liberator.echo(html, true);
         }, {}, true);
-    liberator.modules.commands.addUserCommand(['sbm'],"Post to Social Bookmark",
-        function(arg){
+    // Add :sbm, :sbmo {{{
+    {
+        let action = function(arg){
             var targetServices = useServicesByPost;
             var url = liberator.modules.buffer.URL;
 
             if (arg["-s"]) targetServices = arg["-s"];
-            if (arg["-u"]) url = arg["-u"];
+            if (arg[0]) url = arg[0];
             comment = arg.literalArg;
 
             var tags = [];
@@ -768,80 +769,97 @@ for Migemo search: require XUL/Migemo Extension
             }
             d.error(function(e){liberator.echoerr("direct_bookmark.js: Exception throwed! " + e);liberator.log(e);});
             setTimeout(function(){first.call();},0);
-        },{
-            literal: 0,
-            completer: let (lastURL, lastUserTags, onComplete, done = true) function(context, arg){
-                function matchPosition (e){
-                    let m = liberator.globalVariables.direct_sbm_tag_match || 'prefix';
-                    switch (m) {
-                    case 'infix': return e;
-                    case 'suffix': return e + "$";
-                    }
-                    return "^" + e;
+        };
+
+        let completer = let (lastURL, lastUserTags, onComplete, done = true) function(context, arg){
+            function matchPosition (e){
+                let m = liberator.globalVariables.direct_sbm_tag_match || 'prefix';
+                switch (m) {
+                case 'infix': return e;
+                case 'suffix': return e + "$";
                 }
+                return "^" + e;
+            }
 
-                function set (context, tags) {
-                    let filter = context.filter;
-                    var match_result = filter.match(/((?:\[[^\]]*\])*)\[?(.*)/); //[all, commited, now inputting]
-                    var expr = XMigemoCore && isUseMigemo ? "(" + XMigemoCore.getRegExp(match_result[2]) + ")"
-                                                          : match_result[2];
-                    var m = new RegExp(matchPosition(expr),'i');
+            function set (context, tags) {
+                let filter = context.filter;
+                var match_result = filter.match(/((?:\[[^\]]*\])*)\[?(.*)/); //[all, commited, now inputting]
+                var expr = XMigemoCore && isUseMigemo ? "(" + XMigemoCore.getRegExp(match_result[2]) + ")"
+                                                      : match_result[2];
+                var m = new RegExp(matchPosition(expr),'i');
 
-                    context.advance( match_result[1].length );
+                context.advance( match_result[1].length );
 
-                    context.incomplete = false;
-                    context.completions =
-                        [ ["[" + tag + "]","Tag"]
-                          for each (tag in tags)
-                          if (m.test(tag) && match_result[1].indexOf('[' + tag + ']') < 0) ];
-                }
+                context.incomplete = false;
+                context.completions =
+                    [ ["[" + tag + "]","Tag"]
+                      for each (tag in tags)
+                      if (m.test(tag) && match_result[1].indexOf('[' + tag + ']') < 0) ];
+            }
 
-                let url = arg["-u"] || buffer.URL;
-
-                context.fork('UserTags', 0, context, function(context){
-                    context.title = ['User Tags', 'User Tags'];
-
-                    onComplete = function(tags){
-                        done = true;
-                        lastUserTags = tags;
-                        context.incomplete = false;
-                        set(context, tags);
-                    };
-
-                    /*
-                     * TODO: Complete --url argument like :open
-                     */
-                    if (url == lastURL){
-                        if (done) {
-                            onComplete(lastUserTags);
-                        } else {
-                            context.incomplete = true;
-                        }
+            let url = arg[0] || buffer.URL;
+            liberator.log(url);
+
+            context.fork('UserTags', 0, context, function(context){
+                context.title = ['User Tags', 'User Tags'];
+
+                onComplete = function(tags){
+                    done = true;
+                    lastUserTags = tags;
+                    context.incomplete = false;
+                    set(context, tags);
+                };
+
+                /*
+                 * TODO: Complete --url argument like :open
+                 */
+                if (url == lastURL){
+                    if (done) {
+                        onComplete(lastUserTags);
                     } else {
-                        lastURL = url;
                         context.incomplete = true;
-                        done = false;
-                        getUserTags(url, function (tags) onComplete(tags));
                     }
-                });
+                } else {
+                    lastURL = url;
+                    context.incomplete = true;
+                    done = false;
+                    getUserTags(url, function (tags) onComplete(tags));
+                }
+            });
 
-                context.fork('MyTags', 0, context, function(context, arg){
-                    context.title = ['My Tag','Description'];
+            context.fork('MyTags', 0, context, function(context, arg){
+                context.title = ['My Tag','Description'];
 
-                    if(__context__.tags.isEmpty){
-                        context.incomplete = true;
-                        getTagsAsync(set.bind(null, context)).call([]);
-                    } else {
-                        set(context, __context__.tags);
-                    }
-                });
-            },
-            options: [
-                [['-s','-service'], liberator.modules.commands.OPTION_STRING],
-                [['-u','--url'], liberator.modules.commands.OPTION_STRING],
-            ]
-        },
-        true
-    );
+                if(__context__.tags.isEmpty){
+                    context.incomplete = true;
+                    getTagsAsync(set.bind(null, context)).call([]);
+                } else {
+                    set(context, __context__.tags);
+                }
+            });
+        };
+
+        let options = [ [['-s','-service'], liberator.modules.commands.OPTION_STRING] ];
+
+        let urlCompleter = function(context, args){
+            if (args.length <= 1) {
+                return completion.url(context, 'hsl');
+            } else {
+                return completer(context, args);
+            }
+        };
+
+        liberator.modules.commands.addUserCommand(['sbm'],"Post to Social Bookmark (Current Buffer)",
+            action,
+            {literal: 0, completer: completer, options: options},
+            true
+        );
+
+        liberator.modules.commands.addUserCommand(['sbmo[ther]'],"Post to Social Bookmark",
+            action,
+            {literal: 1, completer: urlCompleter, options: options},
+            true
+        );
+    } // }}}
 })();
 // vim:sw=4 ts=4 et:
-- 
cgit v1.2.3