patches/model.Tumblr.private.js.txt versions/tombloo.0.3.28.xpi xpi/chrome/content/library/21_Clipp.js @@ -1,4 +1,4 @@ -shortcutkeys['CTRL + SHIFT + R'] = { +shortcutkeys[[KEY_ACCEL, 'SHIFT', 'R'].join('+')] = { description : 'Reload Tombloo Environment', execute : function(e){ cancel(e); patches/shortcutkey.reloadEnvironment.js tombloo.xpi @@ -2,21 +2,21 @@ <RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#" xmlns:NC="http://home.netscape.com/NC-rdf#" xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <RDF:Seq RDF:about="rdf:#$iUwd4"> - <RDF:li RDF:resource="rdf:#$jUwd4"/> + <RDF:Seq RDF:about="rdf:#$RJbGT1"> + <RDF:li RDF:resource="rdf:#$SJbGT1"/> </RDF:Seq> <RDF:Description RDF:about="urn:mozilla:extension:tombloo@brasil.to" - em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAG0SVQ/fyhfAHcXiqgB2ntyQRyJokuGszUP5C61rRL6wvdqdns50sQ1aF5xgNBNRjPtwnN8iHDjhY26WOVwslXmxsRtbxPU53rz6AxskiRftmaQEPi1ILtZa6nBQcw0K5+VOE2KQBlKpVsbzJhGw3DYn4SEO7T09RgkIQv4qWTNT"> - <em:updates RDF:resource="rdf:#$iUwd4"/> + em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAC59j1yMprZY5PVW28SYnMk/amohZjBYWGMtB4hQcUmzIWegY4/8HC2l97UpirEqJPAgH6bqqF6eMI/R9nRwI0Ow1oJ/60J0dkajr1BRPe1KMerNl2fbXjcPb92lo8z86bCk27XFxuGKV3PH585lCCwNR0yeQBJ0tbbhtIF7hTNw"> + <em:updates RDF:resource="rdf:#$RJbGT1"/> </RDF:Description> - <RDF:Description RDF:about="rdf:#$jUwd4" - em:version="0.3.27"> - <em:targetApplication RDF:resource="rdf:#$mUwd4"/> + <RDF:Description RDF:about="rdf:#$SJbGT1" + em:version="0.3.28"> + <em:targetApplication RDF:resource="rdf:#$VJbGT1"/> </RDF:Description> - <RDF:Description RDF:about="rdf:#$mUwd4" + <RDF:Description RDF:about="rdf:#$VJbGT1" em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" em:minVersion="3.0" em:maxVersion="3.1.*" - em:updateLink="http://github.com/to/tombloo/tree/release/tombloo.xpi?raw=true" - em:updateHash="sha512:822be9bca5d596970a4227dab44b618c7d8dc25e2f356cb8074e8e623e148d8da978318ecbb3ca31a02f34a4a51b59ce4158aa2932bc6814c385fc1e881550ec" /> + em:updateLink="http://github.com/to/tombloo/raw/release/tombloo.xpi" + em:updateHash="sha512:75ffebe01e0a0ee3122f4b23ad56d6a096db6df6eefe40166dadb41c12ebaf497b7a51b95036d4197419e194af8d5305d7d7447a7506e70ea9b893af2d8473b7" /> </RDF:RDF> update.rdf @@ -47,6 +47,8 @@ <label value="cxx" class="text-link" onclick="openURL('http://cxx.tumblr.com/')" /> <label value="Constellation" class="text-link" onclick="openURL('http://d.hatena.ne.jp/Constellation/')" /> <label value="YungSang" class="text-link" onclick="openURL('http://blog.yungsang.com/')" /> + <label value="zorio" class="text-link" onclick="openURL('http://d.hatena.ne.jp/zorio/')" /> + <label value="simonetta" class="text-link" onclick="openURL('http://blog.livedoor.jp/s_i_m_o_n_e_t_t_a/')" /> </vbox> <label class="sectionTitle"></label> xpi/chrome/content/about.xul @@ -12,11 +12,12 @@ var KEY_ACCEL = (AppInfo.OS == 'Darwin')? 'META' : 'CTRL'; var grobal = this; disconnectAll(grobal); -// リロードによっって変更されない領域を用意する +// リロードによって変更されない領域を用意する // イベントに安定してフックするためなどに使われる if(typeof(constant)=='undefined') constant = {}; + // ----[XPCOM]------------------------------------------------- function evalInSandbox(js, url){ return Components.utils.evalInSandbox(js, Components.utils.Sandbox(url)); @@ -274,6 +275,20 @@ function putContents(file, text, charset){ stream.write(text, text.length); }); } + +/** + * チャンネルにクッキーを付加する。 + * Firefox 3.1でnetwork.cookie.cookieBehaviorの値に関わらずクッキーが設定されなくなった。 + * 詳細調査中。 + * + * @param {nsIHttpChannel} channel + */ +function setCookie(channel){ + if(!(channel instanceof Ci.nsIHttpChannel)) + return; + + channel.setRequestHeader('Cookie', getCookieString(channel.originalURI.host), true); +} /** * POST/GETの通信を行う。 @@ -295,14 +310,6 @@ function putContents(file, text, charset){ function request(url, opts){ var d = new Deferred(); - function setCookie(channel){ - // サードパーティのクッキーを送信するか? - if(getPrefValue('network.cookie.cookieBehavior') != 1) - return; - - channel.setRequestHeader('Cookie', getCookieString(channel.originalURI.host), true); - } - opts = opts || {}; var uri = createURI(url + queryString(opts.queryString, true)); @@ -417,8 +424,7 @@ function request(url, opts){ return; } - // パフォーマンスを考慮しbroadを使わない - setCookie(newChannel.QueryInterface(Ci.nsIHttpChannel)); + setCookie(newChannel); }, // nsIStreamListener @@ -1015,13 +1021,24 @@ function addAround(target, methodNames, advice){ }); } +/** + * 配列を結合し文字列を作成する。 + * 空要素は除外される。 + * 配列が空の場合は、空文字列が返される。 + * 配列の入れ子は直列化される。 + * + * @param {Array} txts 文字列配列。 + * @param {String} delm 区切り文字列。 + * @param {Boolean} trimTag 各文字列からHTMLタグを除外するか。 + * @return {String} 結合された文字列。 + */ function joinText(txts, delm, trimTag){ if(!txts) return ''; if(delm==null) delm = ','; - txts = flattenArray(txts.filter(operator.truth)); + txts = flattenArray([].concat(txts).filter(operator.truth)); return (trimTag? txts.map(methodcaller('trimTag')) : txts).join(delm); } @@ -1042,6 +1059,43 @@ function validateFileName(fileName){ return fileName.replace(/[\/]+/g, "_"); } +/** + * Windows上でWSHを実行する。 + * スクリプト内でWScript.echoなどで出力された文字列も返り値に含まれる。 + * + * @param {Function} func WSHスクリプト。 + * @param {Array} args WSHスクリプトの引数。 + * @return {String} WSHスクリプトの実行結果。 + */ +function executeWSH(func, args){ + args = args || []; + + var bat = getTempFile('bat'); + var script = getTempFile(); + var out = new LocalFile(script.path + '.out'); + + putContents(bat, [ + 'cscript //E:JScript //Nologo', + script.path.quote(), + '>', + out.path.quote()].join(' ')); + putContents(script, + args.map(function(a, i){return 'var ARG_' + i + ' = ' + uneval(a) + ';'}).join('\n') + + 'WScript.echo(' + func.toSource() + '(' + + args.map(function(a, i){return 'ARG_' + i}).join(',') + + '));'); + + new Process(bat).run(true, [], 0); + + var res = getContents(out, 'Shift-JIS').replace(/\s+$/, ''); + + bat.remove(false); + script.remove(false); + out.remove(false); + + return res; +} + // ----[State]------------------------------------------------- var State = { @@ -1133,17 +1187,13 @@ Repository.prototype = { }, get names(){ - return reduce(function(memo, i){ - memo.push(i[0]); - return memo; - }, this, []); + return this.values.map(itemgetter('name')); }, get values(){ - return reduce(function(memo, i){ - memo.push(i[1]); - return memo; - }, this, []); + return map(itemgetter(1), this).filter(function(v){ + return v.name; + }); }, clear : function(){ @@ -1174,6 +1224,12 @@ Repository.prototype = { }, this.values, []); }, + /** + * 新しい定義を追加する。 + * + * @param {Array} defs + * @param {String} target 追加対象。この名前の前に追加される。 + */ register : function(defs, target){ if(!defs) return; @@ -1802,6 +1858,7 @@ AbstractSessionService = { delete this.cookie; delete this.user; delete this.token; + delete this.password; if(!cookie) return 'none'; xpi/chrome/content/library/01_utility.js @@ -219,7 +219,7 @@ var Tumblr = update({}, AbstractSessionService, { // Tumblrから他サービスへポストするため画像URLを取得しておく if(form['post[type]']=='photo') - form.image = $x('id("edit_post")//img[starts-with(@src, "http://media.tumblr.com/") or starts-with(@src, "http://data.tumblr.com/")]/@src', doc); + form.image = $x('id("edit_post")//img[contains(@src, "media.tumblr.com/") or contains(@src, "data.tumblr.com/")]/@src', doc); } return form; xpi/chrome/content/library/20_Tumblr.js @@ -940,8 +940,15 @@ models.register({ function getTags(part){ return $x('id("save-' + part + '-tags")//a[contains(@class, "tag-list-tag")]/text()', doc, true); } - return { + editPage : editPage = 'http://delicious.com/save?url=' + url, + form : { + item : $x('id("title")', doc).value, + description : $x('id("notes")', doc).value, + tags : $x('id("tags")', doc).value.split(' '), + private : $x('id("share")', doc).checked, + }, + duplicated : !!doc.getElementById('delete'), recommended : getTags('reco'), popular : getTags('pop'), @@ -1244,28 +1251,37 @@ if(NavBookmarksService){ }); } -models.register({ + +models.register(update({ name : 'Instapaper', ICON : 'chrome://tombloo/skin/instapaper.ico', - + POST_URL: 'http://www.instapaper.com/edit', check : function(ps){ - return (/(quote|link)/).test(ps.type) && !ps.file; + return (/(quote|link)/).test(ps.type); + }, + getAuthCookie : function(){ + return getCookieString('www.instapaper.com', 'pfu'); }, - post : function(ps){ - return request('http://www.instapaper.com/edit', { - redirectionLimit : 0, - sendContent : { - 'bookmark[title]' : ps.item, - 'bookmark[url]' : ps.itemUrl, - 'bookmark[selection]' : joinText([ps.body, ps.description], '\n', true), - }, - }).addCallback(function(res){ - if(res.channel.URI.asciiSpec.match('login')) - throw new Error(getMessage('error.notLoggedin')); + var url = this.POST_URL; + return this.getSessionValue('token', function(){ + return request(url).addCallback(function(res){ + var doc = convertToHTMLDocument(res.responseText); + return $x('//input[@id="form_key"]/@value', doc); + }); + }).addCallback(function(token){ + return request(url, { + redirectionLimit: 0, + sendContent: { + 'form_key': token, + 'bookmark[url]': ps.itemUrl, + 'bookmark[title]': ps.item, + 'bookmark[selection]': joinText([ps.body, ps.description]) + } + }); }); - }, -}); + } +}, AbstractSessionService)); // http://www.kawa.net/works/ajax/romanize/japanese.html @@ -1708,9 +1724,16 @@ models.register(update({ }, }) }).addCallback(function(res){ - var tags = evalInSandbox('(' + res.responseText.extract(/var tags =(.*);$/m) + ')', HatenaBookmark.POST_URL) || {}; + var tags = evalInSandbox( + '(' + res.responseText.extract(/var tags =(.*);$/m) + ')', + HatenaBookmark.POST_URL) || {}; + return { duplicated : (/bookmarked-confirm/).test(res.responseText), + recommended : $x( + 'id("recommend-tags")/span[@class="tag"]/text()', + convertToHTMLDocument(res.responseText), + true), tags : map(function([tag, info]){ return { name : tag, @@ -1916,6 +1939,28 @@ models.register({ }, }); +models.register({ + name: 'Femo', + ICON: 'http://femo.jp/favicon.ico', + POST_URL: 'http://femo.jp/create/post', + + check: function(ps) { + return (/(regular|photo|quote|link|conversation|video)/).test(ps.type) && !ps.file; + }, + post: function(ps) { + return this.addMemo(ps); + }, + addMemo : function(ps){ + return request(this.POST_URL, { + sendContent: { + title : ps.item, + text : joinText([ps.itemUrl, ps.body, ps.description], '\n'), + tagtext : joinText(ps.tags, ' '), + }, + }); + }, +}); + // 全てのサービスをグローバルコンテキストに置く(後方互換) models.copyTo(this); xpi/chrome/content/library/20_model.js @@ -57,7 +57,74 @@ Tombloo.Service.extractors = new Repository([ } }, }, - + + { + name: 'ReBlog - Clipp', + ICON: 'http://clipp.in/favicon.ico', + check: function(ctx) { + return this.getLink(ctx); + }, + extract: function(ctx) { + var link = this.getLink(ctx); + if(!link) + return {}; + + var self = this; + var endpoint = Clipp.CLIPP_URL + 'bookmarklet' + link; + return Clipp.getForm(endpoint).addCallback(function(form) { + return update({ + type: 'link', + item: ctx.title, + itemUrl: ctx.href, + favorite: { + name: 'Clipp', + endpoint: endpoint, + form: form + } + }, self.convertToParams(form)); + }); + }, + checkEntryPage: function(ctx) { + return (/clipp.in\/entry\/(\d+)/).test(ctx.href); + }, + getLink: function(ctx) { + return this.checkEntryPage(ctx) ? this.getLinkByPage(currentDocument()) : this.getLinkByTarget(ctx); + }, + getLinkByPage: function(doc) { + return $x('//a[contains(@href, "add?reblog=")]/@href', doc); + }, + getLinkByTarget: function(ctx) { + return $x('./ancestor-or-self::div[contains(concat(" ", @class, " "), " item ")]//a[contains(@href, "add?reblog=")]/@href', ctx.target); + }, + convertToParams: function(form) { + if (form.embed_code) + return { + type: 'video', + item: form.title, + itemUrl: form.address, + body: form.embed_code + }; + else if (form.image_address) + return { + type: 'photo', + item: form.title, + itemUrl: form.image_address + }; + else if (form.quote && form.quote != '<br>') + return { + type: 'quote', + item: form.title, + itemUrl: form.address, + body: form.quote + }; + return { + type: 'link', + item: form.title, + itemUrl: form.address + }; + } + }, + { name : 'Photo - LDR(FFFFOUND!)', ICON : 'http://reader.livedoor.com/favicon.ico', @@ -240,25 +307,31 @@ Tombloo.Service.extractors = new Repository([ return ctx.href.match('//twitter.com/.*?/(status|statuses)/\\d+'); }, extract : function(ctx){ - var body = ctx.selection; - if(!body){ - var content = $x('(//span[@class="entry-content"])[1]'); - $x('.//a', content, true).forEach(function(l){l.href = l.href;}); - body = content.innerHTML. - replace(/ (rel|target)=".+?"/g, ''). - replace('<a href="' + ctx.href.replace('/statuses/','/status/') + '">...</a>', ''); - } - - return { - type : 'quote', - item : ctx.title.substring(0, ctx.title.indexOf(': ')), - itemUrl : ctx.href, - body : body.trim(), - favorite : { - name : 'Twitter', - id : ctx.href.match(/(status|statuses)\/(\d+)/)[2], - }, - } + return (ctx.selection? + succeed(ctx.selection) : + request(ctx.href).addCallback(function(res){ + var doc = convertToHTMLDocument(res.responseText); + var content = $x('(//span[@class="entry-content"])[1]', doc); + + $x('.//a', content, true).forEach(function(l){l.href = l.href;}); + body = content.innerHTML. + replace(/ (rel|target)=".+?"/g, ''). + replace('<a href="' + ctx.href.replace('/statuses/','/status/') + '">...</a>', ''); + + return body; + }) + ).addCallback(function(body){ + return { + type : 'quote', + item : ctx.title.substring(0, ctx.title.indexOf(': ')), + itemUrl : ctx.href, + body : body.trim(), + favorite : { + name : 'Twitter', + id : ctx.href.match(/(status|statuses)\/(\d+)/)[2], + }, + }; + }); }, }, @@ -465,6 +538,21 @@ Tombloo.Service.extractors = new Repository([ }, }, + { + name: 'ReBlog - Dashboard iPhone', + ICON: 'chrome://tombloo/skin/reblog.ico', + check: function(ctx){ + return (/(tumblr\.com)\/iphone/).test(ctx.href) && this.getLink(ctx); + }, + extract : function(ctx){ + return Tombloo.Service.extractors.ReBlog.extractByLink(ctx, this.getLink(ctx)); + }, + getLink : function(ctx){ + var link = $x('./ancestor-or-self::li[starts-with(normalize-space(@id), "post")]//a[contains(concat(" ",normalize-space(@class)," ")," permalink ")]', ctx.target); + return link && link.href; + } + }, + { name : 'ReBlog - Mosaic', ICON : 'chrome://tombloo/skin/reblog.ico', @@ -493,7 +581,7 @@ Tombloo.Service.extractors = new Repository([ RE : new RegExp('^http://(?:.+?.)?static.flickr.com/\\d+?/(\\d+?)_.*'), getImageId : function(ctx){ - if(ctx.host == 'flickr.com' && ctx.target.src.match('spaceball.gif')){ + if(/flickr\.com/.test(ctx.host) && ctx.target.src.match('spaceball.gif')){ removeElement(ctx.target); if(currentDocument().elementFromPoint){ @@ -667,7 +755,7 @@ Tombloo.Service.extractors = new Repository([ name : 'Photo - Picasa', ICON : 'http://picasaweb.google.com/favicon.ico', check : function(ctx){ - return ctx.host == 'picasaweb.google.com' && ctx.onImage; + return (/picasaweb\.google\./).test(ctx.host) && ctx.onImage; }, extract : function(ctx){ var item = $x('//span[@class="gphoto-context-current"]/text()') || $x('//div[@class="lhcl_albumtitle"]/text()') || ''; @@ -831,12 +919,11 @@ Tombloo.Service.extractors = new Repository([ return ctx.href.match(/share-image\.com\/gallery\//) && this.getImage(); }, extract : function(ctx){ - return request(this.getImage()).addCallback(function(res){ - return { - type : 'photo', - item : ctx.title, - itemUrl : res.channel.URI.spec, + return request(this.getImage()).addBoth(function(res){ + ctx.target = { + src : (res instanceof Error? res.message : res).channel.URI.spec, } + return Tombloo.Service.extractors['Photo - Upload from Cache'].extract(ctx); }); }, getImage : function(){ @@ -945,6 +1032,7 @@ Tombloo.Service.extractors = new Repository([ 'keep4u.ru/imgs/', '/www.toofly.com/userGallery/', '/www.dru.pl/', + 'adugle.com/shareimagebig/', ], check : function(ctx){ return ctx.onImage; xpi/chrome/content/library/31_Tombloo.Service.extractors.js @@ -127,7 +127,7 @@ resizer[dir="bottomright"] { } #titlebar .widget{ - cursor: default !important; + cursor: default; margin-left: 10px; } xpi/chrome/content/quickPostForm.css @@ -346,6 +346,20 @@ FormPanel.prototype = { signal(this, 'post'); }, + populateFields : function(ps){ + if(!ps) + return; + + var self = this; + items(ps).forEach(function([name, value]){ + var field = self.fields[name]; + if(!field || !value) + return; + + field.value = value; + }); + }, + createForm : function(){ var elmForm = this.elmForm; var self = this; @@ -417,6 +431,7 @@ FormPanel.prototype = { addWidgetToTitlebar : function(elm){ addElementClass(elm, 'widget'); insertSiblingNodesBefore(document.getElementById('titleSpace'), elm); + return elm; }, toggleDetail : function(){ @@ -466,6 +481,10 @@ function EditableLabel(elmBox){ } EditableLabel.prototype = { + set value(value){ + return this.elmTextbox.value = value; + }, + get value(){ return this.elmTextbox.value; }, @@ -575,13 +594,19 @@ function TagsPanel(elmPanel, formPanel){ if(self.suggest){ self.showSuggestions(res); - self.finishLoading(); } - if(res.duplicated) - self.showBookmarked(); + if(res.duplicated){ + self.formPanel.populateFields(res.form); + self.showBookmarked(res.editPage); + } }).addErrback(function(e){ + setTimeout(function(){ + alert(self.tagProvider + ': ' + e.message); + }, 50); error(e); + }).addBoth(function(){ + self.finishLoading(); }); } }, false); @@ -592,6 +617,10 @@ function TagsPanel(elmPanel, formPanel){ TagsPanel.prototype = { elmTags : {}, + set value(values){ + return this.elmCompletion.value = joinText(values, ' '); + }, + get value(){ return this.elmCompletion.values; }, @@ -635,6 +664,7 @@ TagsPanel.prototype = { showSuggestions : function(res){ var self = this; withDocument(document, function(){ + // inputイベントで高速にチェックをする必要があるためハッシュで持つ self.elmTags = {}; @@ -657,13 +687,20 @@ TagsPanel.prototype = { }); }, - showBookmarked : function(){ + showBookmarked : function(editPage){ var self = this; withDocument(document, function(){ - self.formPanel.addWidgetToTitlebar(IMAGE({ + var elmStar = self.formPanel.addWidgetToTitlebar(IMAGE({ tooltiptext : getMessage('label.bookmarked'), src : 'chrome://tombloo/skin/star.png', })); + + if(editPage){ + elmStar.style.cursor = 'pointer'; + elmStar.addEventListener('click', function(){ + addTab(editPage); + }, true); + } }); }, @@ -924,6 +961,10 @@ DescriptionBox.prototype = { this.elmBox.hidden = this.hidden; }, + set value(value){ + return this.elmDescription.value = value; + }, + get value(){ return this.elmDescription.value; }, xpi/chrome/content/quickPostForm.js @@ -287,11 +287,14 @@ try { is(repo.find('A|D').length, 2); is(repo.find(/A|D/).length, 2); + repo.extract = function(){}; repo.register({ name : 'GHI', check : function(c){}, }, 'DEF'); is(repo.names.join(), 'ABC,GHI,DEF', '途中に追加できるか'); + ok(repo.extract, '定義以外のデータが消えないか'); + ok(getDataDir().exists(), 'データディレクトリが存在するか'); xpi/chrome/content/test/test_utility.html @@ -6,7 +6,7 @@ <em:id>tombloo@brasil.to</em:id> <em:type>2</em:type> <em:name>Tombloo</em:name> - <em:version>0.3.27</em:version> + <em:version>0.3.28</em:version> <em:creator>to</em:creator> <em:description></em:description> <em:optionsURL>chrome://tombloo/content/prefs.xul</em:optionsURL> xpi/install.rdf 5be0c60b9fddac3c330c5f95bb73de567848dcf1 6267c222a6bc78a8311bd2299dada9cdd211f53a to ryutaro.kamitsu@gmail.com http://github.com/to/tombloo/commit/4d5eacb51f4b757e9d3583fe3c15ed802f857817 4d5eacb51f4b757e9d3583fe3c15ed802f857817 2009-01-18T00:17:14-08:00 2009-01-18T00:17:14-08:00 Merge commit 'origin/master' into release 605282f71e7fbf4edec8b034a28fd0b842723361 to ryutaro.kamitsu@gmail.com