-rw-r--r-- | content/flickr.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/flickr.js b/content/flickr.js index 75d1a72..b8360c1 100644 --- a/content/flickr.js +++ b/content/flickr.js | |||
@@ -1,352 +1,356 @@ | |||
1 | /* | 1 | /* |
2 | * Photoset | 2 | * Photoset |
3 | */ | 3 | */ |
4 | 4 | ||
5 | function Photoset(s) { | 5 | function Photoset(s) { |
6 | if(s instanceof Photoset) { | 6 | if(s instanceof Photoset) { |
7 | for(var p in s) this[p]=s[p]; | 7 | for(var p in s) this[p]=s[p]; |
8 | }else | 8 | }else |
9 | this.fromNode(s); | 9 | this.fromNode(s); |
10 | } | 10 | } |
11 | Photoset.prototype = { | 11 | Photoset.prototype = { |
12 | id: null, | 12 | id: null, |
13 | primary: null, | 13 | primary: null, |
14 | secret: null, | 14 | secret: null, |
15 | server: null, | 15 | server: null, |
16 | photos: null, | 16 | photos: null, |
17 | title: null, | 17 | title: null, |
18 | description: null, | 18 | description: null, |
19 | fromNode: function(n) { | 19 | fromNode: function(n) { |
20 | this.id = n.getAttribute('id'); | 20 | this.id = n.getAttribute('id'); |
21 | this.primary = n.getAttribute('primary'); | 21 | this.primary = n.getAttribute('primary'); |
22 | this.secret = n.getAttribute('secret'); | 22 | this.secret = n.getAttribute('secret'); |
23 | this.server = n.getAttribute('server'); | 23 | this.server = n.getAttribute('server'); |
24 | this.photos = n.getAttribute('photos'); | 24 | this.photos = n.getAttribute('photos'); |
25 | this.title = n.getElementsByTagName('title').item(0).firstChild.nodeValue; | 25 | this.title = n.getElementsByTagName('title').item(0).firstChild.nodeValue; |
26 | this.description = n.getElementsByTagName('description').item(0).firstChild; | 26 | this.description = n.getElementsByTagName('description').item(0).firstChild; |
27 | if(this.description) this.description = this.description.nodeValue; | 27 | if(this.description) this.description = this.description.nodeValue; |
28 | } | 28 | } |
29 | }; | 29 | }; |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * Photo | 32 | * Photo |
33 | */ | 33 | */ |
34 | function Photo(s) { | 34 | function Photo(s) { |
35 | if(s instanceof Photo) { | 35 | if(s instanceof Photo) { |
36 | for(var p in s) this[p]=s[p]; | 36 | for(var p in s) this[p]=s[p]; |
37 | }else | 37 | }else |
38 | this.fromNode(s); | 38 | this.fromNode(s); |
39 | } | 39 | } |
40 | Photo.prototype = { | 40 | Photo.prototype = { |
41 | id: null, secret: null, | 41 | id: null, secret: null, |
42 | server: null, | 42 | server: null, |
43 | title: null, | 43 | title: null, |
44 | isprimary: null, | 44 | isprimary: null, |
45 | license: null, | 45 | license: null, |
46 | dateupload: null, datetaken: null, datetakengranularity: null, | 46 | dateupload: null, datetaken: null, datetakengranularity: null, |
47 | ownername: null, | 47 | ownername: null, |
48 | iconserver: null, | 48 | iconserver: null, |
49 | originalformat: null, | 49 | originalformat: null, |
50 | lastupdate: null, | 50 | lastupdate: null, |
51 | fromNode: function(n) { | 51 | fromNode: function(n) { |
52 | this.id = n.getAttribute('id'); this.secret = n.getAttribute('secret'); | 52 | this.id = n.getAttribute('id'); this.secret = n.getAttribute('secret'); |
53 | this.server = n.getAttribute('server'); | 53 | this.server = n.getAttribute('server'); |
54 | this.title = n.getAttribute('title'); | 54 | this.title = n.getAttribute('title'); |
55 | this.isprimary = n.getAttribute('isprimary'); | 55 | this.isprimary = n.getAttribute('isprimary'); |
56 | this.license = n.getAttribute('license'); | 56 | this.license = n.getAttribute('license'); |
57 | this.dateupload = n.getAttribute('dateupload'); | 57 | this.dateupload = n.getAttribute('dateupload'); |
58 | this.datetaken = n.getAttribute('datetaken'); this.datetakengranularity = n.getAttribute('datetakengranularity'); | 58 | this.datetaken = n.getAttribute('datetaken'); this.datetakengranularity = n.getAttribute('datetakengranularity'); |
59 | this.ownername = n.getAttribute('ownername'); | 59 | this.ownername = n.getAttribute('ownername'); |
60 | this.iconserver = n.getAttribute('iconserver'); | 60 | this.iconserver = n.getAttribute('iconserver'); |
61 | this.originalformat = n.getAttribute('originalformat'); | 61 | this.originalformat = n.getAttribute('originalformat'); |
62 | this.lastupdate = n.getAttribute('lastupdate'); | 62 | this.lastupdate = n.getAttribute('lastupdate'); |
63 | }, | 63 | }, |
64 | fromNode_: function(n) { | 64 | fromNode_: function(n) { |
65 | var t; | 65 | var t; |
66 | // TODO: @rotation @isfavorite | 66 | // TODO: @rotation @isfavorite |
67 | this.owner = {}; | 67 | this.owner = {}; |
68 | t = n.getElementsByTagName('owner').item(0); | 68 | t = n.getElementsByTagName('owner').item(0); |
69 | if(t) { | 69 | if(t) { |
70 | this.owner.nsid=t.getAttribute('nsid'); | 70 | this.owner.nsid=t.getAttribute('nsid'); |
71 | this.owner.username=t.getAttribute('username'); | 71 | this.owner.username=t.getAttribute('username'); |
72 | this.owner.realname=t.getAttribute('realname'); | 72 | this.owner.realname=t.getAttribute('realname'); |
73 | this.owner.location=t.getAttribute.location; | 73 | this.owner.location=t.getAttribute.location; |
74 | } | 74 | } |
75 | t = n.getElementsByTagName('description').item(0); | 75 | t = n.getElementsByTagName('description').item(0); |
76 | if(t && t.firstChild) { | 76 | if(t && t.firstChild) { |
77 | this.description = t.firstChild.nodeValue; | 77 | this.description = t.firstChild.nodeValue; |
78 | } | 78 | } |
79 | // TODO: visibility/@ispublic visibility/@isfriend visibility/@isfamily | 79 | // TODO: visibility/@ispublic visibility/@isfriend visibility/@isfamily |
80 | // TODO: dates/@posted dates/@taken dates/@takengranularity dates/@lastupdate | 80 | // TODO: dates/@posted dates/@taken dates/@takengranularity dates/@lastupdate |
81 | // TODO: permissions/@permcomment permsiions/@permaddmeta | 81 | // TODO: permissions/@permcomment permsiions/@permaddmeta |
82 | // TODO: editability/@canaddcomment editability/@canaddmeta | 82 | // TODO: editability/@canaddcomment editability/@canaddmeta |
83 | // TODO: comments | 83 | // TODO: comments |
84 | // TODO: notes/note/@id notes/note/@author notes/note/@authorname | 84 | // TODO: notes/note/@id notes/note/@author notes/note/@authorname |
85 | // TODO: notes/note/@x notes/note/@y notes/note/@w notes/note/@h | 85 | // TODO: notes/note/@x notes/note/@y notes/note/@w notes/note/@h |
86 | // TODO: notes/note | 86 | // TODO: notes/note |
87 | // TODO: tags/tag/@id tags/tag/@author tags/tag/@raw tags/tag | 87 | // TODO: tags/tag/@id tags/tag/@author tags/tag/@raw tags/tag |
88 | // TODO: urls/url/@type urls/url | 88 | // TODO: urls/url/@type urls/url |
89 | } | 89 | } |
90 | }; | 90 | }; |
91 | 91 | ||
92 | function Flickr() { } | 92 | function Flickr() { } |
93 | Flickr.prototype = { | 93 | Flickr.prototype = { |
94 | 94 | ||
95 | rest_url: 'http://www.flickr.com/services/rest/', | 95 | rest_url: 'http://www.flickr.com/services/rest/', |
96 | auth_url: 'http://flickr.com/services/auth/', | 96 | auth_url: 'http://flickr.com/services/auth/', |
97 | photo_url: 'http://static.flickr.com/', | 97 | photo_url: 'http://static.flickr.com/', |
98 | photos_url: 'http://www.flickr.com/photos/', | 98 | photos_url: 'http://www.flickr.com/photos/', |
99 | upload_url: 'http://www.flickr.com/services/upload/', | 99 | upload_url: 'http://www.flickr.com/services/upload/', |
100 | 100 | ||
101 | api_sig: function(paramstr) { | 101 | api_sig: function(paramstr) { |
102 | return MD5(toutf8(this.api_shs+paramstr)); | 102 | return MD5(toutf8(this.api_shs+paramstr)); |
103 | }, | 103 | }, |
104 | api_call_url: function(params,url) { | 104 | api_call_url: function(params,url) { |
105 | params.api_key = this.api_key; | 105 | params.api_key = this.api_key; |
106 | var pp = new Array(); | 106 | var pp = new Array(); |
107 | for(var p in params) { | 107 | for(var p in params) { |
108 | pp.push(p); | 108 | pp.push(p); |
109 | } | 109 | } |
110 | var pstr = ''; | 110 | var pstr = ''; |
111 | var rv = (url?url:this.rest_url)+'?'; | 111 | var rv = (url?url:this.rest_url)+'?'; |
112 | for(var p in pp.sort()) { | 112 | for(var p in pp.sort()) { |
113 | var pn = pp[p]; | 113 | var pn = pp[p]; |
114 | pstr += pn+params[pn]; | 114 | pstr += pn+params[pn]; |
115 | rv += pn+'='+params[pn]+'&'; | 115 | rv += pn+'='+params[pn]+'&'; |
116 | } | 116 | } |
117 | rv += 'api_sig='+this.api_sig(pstr); | 117 | rv += 'api_sig='+this.api_sig(pstr); |
118 | return rv; | 118 | return rv; |
119 | }, | 119 | }, |
120 | api_call: function(params, on_success, on_failure) { | 120 | api_call: function(params, on_success, on_failure) { |
121 | if(params.auth_token == 'default') | 121 | if(params.auth_token == 'default') |
122 | params.auth_token = this.token; | 122 | params.auth_token = this.token; |
123 | var x = new XMLHttpRequest(); | 123 | var x = new XMLHttpRequest(); |
124 | x.open("GET",this.api_call_url(params)); | 124 | x.open("GET",this.api_call_url(params)); |
125 | x.onreadystatechange=function() { | 125 | x.onreadystatechange=function() { |
126 | if(x.readyState!=4) return false; | 126 | if(x.readyState!=4) return false; |
127 | if(x.status==200) { | 127 | if(x.status==200) { |
128 | var stat = x.responseXML.firstChild.getAttribute('stat'); | 128 | var stat = x.responseXML.firstChild.getAttribute('stat'); |
129 | if(stat=='ok') { | 129 | if(stat=='ok') { |
130 | if(on_success) on_success(x); | 130 | if(on_success) on_success(x); |
131 | }else{ | 131 | }else{ |
132 | var e = x.responseXML.getElementsByTagName('err').item(0); | 132 | var e = x.responseXML.getElementsByTagName('err').item(0); |
133 | var ecode = e.getAttribute('code'); | 133 | var ecode = e.getAttribute('code'); |
134 | var emsg = e.getAttribute('msg'); | 134 | var emsg = e.getAttribute('msg'); |
135 | dump(params.method+' failed: '+ecode+' '+emsg+'\n'); | 135 | dump(params.method+' failed: '+ecode+' '+emsg+'\n'); |
136 | if(on_failure) on_failure(x,stat,ecode,emsg); | 136 | if(on_failure) on_failure(x,stat,ecode,emsg); |
137 | } | 137 | } |
138 | }else{ | 138 | }else{ |
139 | if(on_failure) on_failure(x); | 139 | if(on_failure) on_failure(x); |
140 | } | 140 | } |
141 | return true; | 141 | return true; |
142 | } | 142 | } |
143 | x.send(null); | 143 | x.send(null); |
144 | return true; | 144 | return true; |
145 | }, | 145 | }, |
146 | 146 | ||
147 | frob: null, | 147 | frob: null, |
148 | authorize_0: function(perms, on_s, on_f) { | 148 | authorize_0: function(perms, on_s, on_f) { |
149 | var _this = this; | 149 | var _this = this; |
150 | this.api_call( | 150 | this.api_call( |
151 | { method: 'flickr.auth.getFrob' }, | 151 | { method: 'flickr.auth.getFrob' }, |
152 | function(x) { | 152 | function(x) { |
153 | _this.frob = xp_str('/rsp/frob',x.responseXML); | 153 | _this.frob = xp_str('/rsp/frob',x.responseXML); |
154 | var u = _this.api_call_url( | 154 | var u = _this.api_call_url( |
155 | { frob: _this.frob, perms: perms?perms:'delete' }, _this.auth_url ); | 155 | { frob: _this.frob, perms: perms?perms:'delete' }, _this.auth_url ); |
156 | if(on_s) on_s(x,_this.frob,u); | 156 | if(on_s) on_s(x,_this.frob,u); |
157 | }, function(x,s,c,m) { | 157 | }, function(x,s,c,m) { |
158 | if(on_f) on_f(x,s,c,m); | 158 | if(on_f) on_f(x,s,c,m); |
159 | } | 159 | } |
160 | ); | 160 | ); |
161 | }, | 161 | }, |
162 | token: null, | 162 | token: null, |
163 | perms: null, | 163 | perms: null, |
164 | user: null, | 164 | user: null, |
165 | authorize_1: function(on_s, on_f) { | 165 | authorize_1: function(on_s, on_f) { |
166 | var _this = this; | 166 | var _this = this; |
167 | this.api_call( | 167 | this.api_call( |
168 | { method: 'flickr.auth.getToken', frob: this.frob }, | 168 | { method: 'flickr.auth.getToken', frob: this.frob }, |
169 | function(x) { | 169 | function(x) { |
170 | _this.token = xp_str('/rsp/auth/token',x.responseXML); | 170 | _this.token = xp_str('/rsp/auth/token',x.responseXML); |
171 | _this.perms = xp_str('/rsp/auth/perms',x.responseXML); | 171 | _this.perms = xp_str('/rsp/auth/perms',x.responseXML); |
172 | var u = xp_node('/rsp/auth/user',x.responseXML); | 172 | var u = xp_node('/rsp/auth/user',x.responseXML); |
173 | _this.user = { | 173 | _this.user = { |
174 | nsid: u.getAttribute('nsid'), | 174 | nsid: u.getAttribute('nsid'), |
175 | username: u.getAttribute('username'), | 175 | username: u.getAttribute('username'), |
176 | fullname: u.getAttribute('fullname') | 176 | fullname: u.getAttribute('fullname') |
177 | }; | 177 | }; |
178 | if(on_s) on_s(x); | 178 | if(on_s) on_s(x); |
179 | }, function(x,s,c,m) { | 179 | }, function(x,s,c,m) { |
180 | if(on_f) on_f(x,s,c,m); | 180 | if(on_f) on_f(x,s,c,m); |
181 | } | 181 | } |
182 | ); | 182 | ); |
183 | }, | 183 | }, |
184 | 184 | ||
185 | prefs: Components.classes['@mozilla.org/preferences-service;1'].getService( | 185 | prefs: Components.classes['@mozilla.org/preferences-service;1'].getService( |
186 | Components.interfaces.nsIPrefBranch | 186 | Components.interfaces.nsIPrefBranch |
187 | ), | 187 | ), |
188 | prefs_root: 'net.klever.kin.flickr', | 188 | prefs_root: 'net.klever.kin.flickr', |
189 | save_token: function() { | 189 | save_token: function() { |
190 | // TODO: don't clear when there's nothing to clear or catch exceptions | 190 | // TODO: don't clear when there's nothing to clear or catch exceptions |
191 | if(this.token) | 191 | if(this.token) |
192 | this.prefs.setCharPref(this.prefs_root+'.auth_token',this.token); | 192 | this.prefs.setCharPref(this.prefs_root+'.auth_token',this.token); |
193 | else | 193 | else |
194 | this.prefs.clearUserPref(this.prefs_root+'.auth_token'); | 194 | this.prefs.clearUserPref(this.prefs_root+'.auth_token'); |
195 | if(this.perms) | 195 | if(this.perms) |
196 | this.prefs.setCharPref(this.prefs_root+'.auth_perms',this.perms); | 196 | this.prefs.setCharPref(this.prefs_root+'.auth_perms',this.perms); |
197 | else | 197 | else |
198 | this.prefs.clearUserPref(this.prefs_root+'.auth_perms'); | 198 | this.prefs.clearUserPref(this.prefs_root+'.auth_perms'); |
199 | if(this.user && this.user.nsid!=null && this.user.nsid!=undefined) | 199 | if(this.user && this.user.nsid!=null && this.user.nsid!=undefined) |
200 | this.prefs.setCharPref(this.prefs_root+'.auth_user.nsid',this.user.nsid); | 200 | this.prefs.setCharPref(this.prefs_root+'.auth_user.nsid',this.user.nsid); |
201 | else | 201 | else |
202 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.nsid'); | 202 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.nsid'); |
203 | if(this.user && this.user.username!=null && this.user.username!=undefined) | 203 | if(this.user && this.user.username!=null && this.user.username!=undefined) |
204 | this.prefs.setCharPref(this.prefs_root+'.auth_user.username',this.user.username); | 204 | this.prefs.setCharPref(this.prefs_root+'.auth_user.username',this.user.username); |
205 | else | 205 | else |
206 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.username'); | 206 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.username'); |
207 | if(this.user && this.user.fullname!=null && this.user.fullname!=undefined) | 207 | if(this.user && this.user.fullname!=null && this.user.fullname!=undefined) |
208 | this.prefs.setCharPref(this.prefs_root+'.auth_user.fullname',this.user.fullname); | 208 | this.prefs.setCharPref(this.prefs_root+'.auth_user.fullname',this.user.fullname); |
209 | else | 209 | else |
210 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.fullname'); | 210 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.fullname'); |
211 | }, | 211 | }, |
212 | _reset_token: function() { | 212 | _reset_token: function() { |
213 | this.token = null; this.perms = null; this.user = null; | 213 | this.token = null; this.perms = null; this.user = null; |
214 | return false; | 214 | return false; |
215 | }, | 215 | }, |
216 | load_token: function() { | 216 | load_token: function() { |
217 | try { | 217 | try { |
218 | if(this.prefs.getPrefType(this.prefs_root+'.auth_token')!=this.prefs.PREF_STRING) | 218 | if(this.prefs.getPrefType(this.prefs_root+'.auth_token')!=this.prefs.PREF_STRING) |
219 | return this._reset_token(); | 219 | return this._reset_token(); |
220 | this.token = this.prefs.getCharPref(this.prefs_root+'.auth_token'); | 220 | this.token = this.prefs.getCharPref(this.prefs_root+'.auth_token'); |
221 | if(this.prefs.getPrefType(this.prefs_root+'.auth_perms')!=this.prefs.PREF_STRING) | 221 | if(this.prefs.getPrefType(this.prefs_root+'.auth_perms')!=this.prefs.PREF_STRING) |
222 | return this._reset_token(); | 222 | return this._reset_token(); |
223 | this.perms = this.prefs.getCharPref(this.prefs_root+'.auth_perms'); | 223 | this.perms = this.prefs.getCharPref(this.prefs_root+'.auth_perms'); |
224 | if(this.prefs.getPrefType(this.prefs_root+'.auth_user.nsid')!=this.prefs.PREF_STRING) | 224 | if(this.prefs.getPrefType(this.prefs_root+'.auth_user.nsid')!=this.prefs.PREF_STRING) |
225 | return this._reset_token(); | 225 | return this._reset_token(); |
226 | this.user = new Object(); | 226 | this.user = new Object(); |
227 | this.user.nsid = this.prefs.getCharPref(this.prefs_root+'.auth_user.nsid'); | 227 | this.user.nsid = this.prefs.getCharPref(this.prefs_root+'.auth_user.nsid'); |
228 | if(this.prefs.getPrefType(this.prefs_root+'.auth_user.username')!=this.prefs.PREF_STRING) | 228 | if(this.prefs.getPrefType(this.prefs_root+'.auth_user.username')!=this.prefs.PREF_STRING) |
229 | return this._reset_token(); | 229 | return this._reset_token(); |
230 | this.user.username = this.prefs.getCharPref(this.prefs_root+'.auth_user.username'); | 230 | this.user.username = this.prefs.getCharPref(this.prefs_root+'.auth_user.username'); |
231 | if(this.prefs.getPrefType(this.prefs_root+'.auth_user.fullname')!=this.prefs.PREF_STRING) | 231 | if(this.prefs.getPrefType(this.prefs_root+'.auth_user.fullname')!=this.prefs.PREF_STRING) |
232 | return this._reset_token(); | 232 | return this._reset_token(); |
233 | this.user.fullname = this.prefs.getCharPref(this.prefs_root+'.auth_user.fullname'); | 233 | this.user.fullname = this.prefs.getCharPref(this.prefs_root+'.auth_user.fullname'); |
234 | }catch(e) { return this._reset_token(); } | 234 | }catch(e) { return this._reset_token(); } |
235 | return true; | 235 | return true; |
236 | }, | 236 | }, |
237 | reset_token: function() { | 237 | reset_token: function() { |
238 | this._reset_token(); | 238 | this._reset_token(); |
239 | this.save_token(); | 239 | this.save_token(); |
240 | }, | 240 | }, |
241 | 241 | ||
242 | get_photo_url: function(ser,id,sec,sfx,ext) { | 242 | get_photo_url: function(ser,id,sec,sfx,ext) { |
243 | var rv = this.photo_url + ser + '/' + id + '_' + sec; | 243 | var rv = this.photo_url + ser + '/' + id + '_' + sec; |
244 | if(sfx && sfx!='_') rv += '_'+sfx; | 244 | if(sfx && sfx!='_') rv += '_'+sfx; |
245 | rv += ext?'.'+ext:'.jpg'; | 245 | rv += ext?'.'+ext:'.jpg'; |
246 | return rv; | 246 | return rv; |
247 | }, | 247 | }, |
248 | get_image_url: function(o,sfx) { | 248 | get_image_url: function(o,sfx) { |
249 | return this.get_photo_url( | 249 | return this.get_photo_url( |
250 | o.server, | 250 | o.server, |
251 | (o instanceof Photoset)? o.primary : o.id, | 251 | (o instanceof Photoset)? o.primary : o.id, |
252 | o.secret, | 252 | o.secret, |
253 | sfx, | 253 | sfx, |
254 | (sfx=='o')?o.originalformat:null | 254 | (sfx=='o')?o.originalformat:null |
255 | ); | 255 | ); |
256 | }, | 256 | }, |
257 | get_photo_page_url: function(p) { | 257 | get_photo_page_url: function(p) { |
258 | if(p instanceof Photo) { | 258 | if(p instanceof Photo) { |
259 | // TODO: track photoset and user owner id from there? | 259 | // TODO: track photoset and user owner id from there? |
260 | // The approach below is sheerly wrong. | 260 | // The approach below is sheerly wrong. |
261 | var o = this.user.nsid; | 261 | var o = this.user.nsid; |
262 | if(p.owner && p.owner.nsid) o = p.owner.nsid; | 262 | if(p.owner && p.owner.nsid) o = p.owner.nsid; |
263 | var rv = this.photos_url + o +'/' + p.id; | 263 | var rv = this.photos_url + o +'/' + p.id; |
264 | return rv; | 264 | return rv; |
265 | }else // TODO: take owner into account? | 265 | }else // TODO: take owner into account? |
266 | return this.photos_url + this.user.nsid + '/' + p; | 266 | return this.photos_url + this.user.nsid + '/' + p; |
267 | }, | 267 | }, |
268 | make_photo_url: function(p,sfx) { | 268 | make_photo_url: function(p,sfx) { |
269 | if(sfx=='p') | 269 | if(sfx=='p') |
270 | return this.get_photo_page_url(p); | 270 | return this.get_photo_page_url(p); |
271 | else | 271 | else |
272 | return this.get_image_url(p,sfx); | 272 | return this.get_image_url(p,sfx); |
273 | }, | 273 | }, |
274 | make_photoset_url: function(ps) { | ||
275 | // TODO: allow for using someone else's photoset? | ||
276 | return this.photos_url+this.user.nsid+'/sets/'+ps.id; | ||
277 | }, | ||
274 | 278 | ||
275 | upload_file: function(f,fa,on_success,on_failure) { | 279 | upload_file: function(f,fa,on_success,on_failure) { |
276 | try { | 280 | try { |
277 | var fi = Components.classes["@mozilla.org/file/local;1"] | 281 | var fi = Components.classes["@mozilla.org/file/local;1"] |
278 | .createInstance(Components.interfaces.nsILocalFile); | 282 | .createInstance(Components.interfaces.nsILocalFile); |
279 | fi.initWithPath( f ); | 283 | fi.initWithPath( f ); |
280 | var st = Components.classes["@mozilla.org/network/file-input-stream;1"] | 284 | var st = Components.classes["@mozilla.org/network/file-input-stream;1"] |
281 | .createInstance(Components.interfaces.nsIFileInputStream); | 285 | .createInstance(Components.interfaces.nsIFileInputStream); |
282 | st.init(fi,0x01,00004,null); | 286 | st.init(fi,0x01,00004,null); |
283 | var bis = Components.classes["@mozilla.org/binaryinputstream;1"] | 287 | var bis = Components.classes["@mozilla.org/binaryinputstream;1"] |
284 | .createInstance(Components.interfaces.nsIBinaryInputStream); | 288 | .createInstance(Components.interfaces.nsIBinaryInputStream); |
285 | bis.setInputStream(st); | 289 | bis.setInputStream(st); |
286 | 290 | ||
287 | // allocate and initialize temp storage string | 291 | // allocate and initialize temp storage string |
288 | var pbs = Components.classes["@mozilla.org/storagestream;1"] | 292 | var pbs = Components.classes["@mozilla.org/storagestream;1"] |
289 | .createInstance(Components.interfaces.nsIStorageStream); | 293 | .createInstance(Components.interfaces.nsIStorageStream); |
290 | pbs.init(1024,10000000,null); | 294 | pbs.init(1024,10000000,null); |
291 | // create output stream | 295 | // create output stream |
292 | var pbos = pbs.getOutputStream(0); | 296 | var pbos = pbs.getOutputStream(0); |
293 | // and a binaryoutputstream interface | 297 | // and a binaryoutputstream interface |
294 | var pbbos = Components.classes["@mozilla.org/binaryoutputstream;1"] | 298 | var pbbos = Components.classes["@mozilla.org/binaryoutputstream;1"] |
295 | .createInstance(Components.interfaces.nsIBinaryOutputStream); | 299 | .createInstance(Components.interfaces.nsIBinaryOutputStream); |
296 | pbbos.setOutputStream(pbos); | 300 | pbbos.setOutputStream(pbos); |
297 | 301 | ||
298 | /* create POST body */ | 302 | /* create POST body */ |
299 | var boundarytoken = 'kadaroloongazaduviaxamma'; | 303 | var boundarytoken = 'kadaroloongazaduviaxamma'; |
300 | var boundary = '--'+boundarytoken; | 304 | var boundary = '--'+boundarytoken; |
301 | var b = ''; | 305 | var b = ''; |
302 | 306 | ||
303 | var parms = { api_key: this.api_key, auth_token: this.token }; | 307 | var parms = { api_key: this.api_key, auth_token: this.token }; |
304 | for(var p in fa) parms[p] = fa[p]; | 308 | for(var p in fa) parms[p] = fa[p]; |
305 | var pns = new Array(); | 309 | var pns = new Array(); |
306 | for(var p in parms) pns.push(p); | 310 | for(var p in parms) pns.push(p); |
307 | var pstr = ''; | 311 | var pstr = ''; |
308 | for(var p in pns.sort()) { | 312 | for(var p in pns.sort()) { |
309 | var pn = pns[p]; | 313 | var pn = pns[p]; |
310 | pstr += pn+parms[pn]; | 314 | pstr += pn+parms[pn]; |
311 | b += boundary+'\nContent-Disposition: form-data; name="'+pn+'"\n\n'+toutf8(parms[pn])+'\n'; | 315 | b += boundary+'\nContent-Disposition: form-data; name="'+pn+'"\n\n'+toutf8(parms[pn])+'\n'; |
312 | } | 316 | } |
313 | b += boundary+'\nContent-Disposition: form-data; name="api_sig"\n\n'+this.api_sig(pstr)+'\n'; | 317 | b += boundary+'\nContent-Disposition: form-data; name="api_sig"\n\n'+this.api_sig(pstr)+'\n'; |
314 | b += boundary+'\nContent-Disposition: form-data; name="photo"; filename="'+f+'"\nContent-Type: image/jpeg\nContent-Transfer-Encoding: binary\n\n'; | 318 | b += boundary+'\nContent-Disposition: form-data; name="photo"; filename="'+f+'"\nContent-Type: image/jpeg\nContent-Transfer-Encoding: binary\n\n'; |
315 | pbbos.writeBytes(b,b.length); | 319 | pbbos.writeBytes(b,b.length); |
316 | var bisbytes = bis.available(); | 320 | var bisbytes = bis.available(); |
317 | pbbos.writeBytes(bis.readBytes(bisbytes),bisbytes); | 321 | pbbos.writeBytes(bis.readBytes(bisbytes),bisbytes); |
318 | pbbos.writeBytes('\n'+boundary+'--',3+boundary.length); bis.close(); st.close(); | 322 | pbbos.writeBytes('\n'+boundary+'--',3+boundary.length); bis.close(); st.close(); |
319 | 323 | ||
320 | pbbos.close(); pbos.close(); | 324 | pbbos.close(); pbos.close(); |
321 | 325 | ||
322 | var x = new XMLHttpRequest(); | 326 | var x = new XMLHttpRequest(); |
323 | x.open("POST",this.upload_url); | 327 | x.open("POST",this.upload_url); |
324 | x.setRequestHeader('Content-Type', 'multipart/form-data; boundary="'+boundarytoken+'"'); | 328 | x.setRequestHeader('Content-Type', 'multipart/form-data; boundary="'+boundarytoken+'"'); |
325 | x.setRequestHeader('Connection','close'); | 329 | x.setRequestHeader('Connection','close'); |
326 | x.setRequestHeader('Content-Length',b.length); | 330 | x.setRequestHeader('Content-Length',b.length); |
327 | x.onreadystatechange=function() { | 331 | x.onreadystatechange=function() { |
328 | if(x.readyState!=4) return false; | 332 | if(x.readyState!=4) return false; |
329 | if(x.status==200) { | 333 | if(x.status==200) { |
330 | var stat = x.responseXML.firstChild.getAttribute('stat'); | 334 | var stat = x.responseXML.firstChild.getAttribute('stat'); |
331 | if(stat=='ok') { | 335 | if(stat=='ok') { |
332 | var pid = xp_str('/rsp/photoid',x.responseXML); | 336 | var pid = xp_str('/rsp/photoid',x.responseXML); |
333 | if(on_success) on_success(x,pid); | 337 | if(on_success) on_success(x,pid); |
334 | }else{ | 338 | }else{ |
335 | var e = x.responseXML.getElementsByTagName('err').item(0); | 339 | var e = x.responseXML.getElementsByTagName('err').item(0); |
336 | var ecode = e.getAttribute('code'); | 340 | var ecode = e.getAttribute('code'); |
337 | var emsg = e.getAttribute('msg'); | 341 | var emsg = e.getAttribute('msg'); |
338 | dump('upload failed: '+ecode+' '+emsg+'\n'); | 342 | dump('upload failed: '+ecode+' '+emsg+'\n'); |
339 | if(on_failure) on_failure(x,stat,ecode,emsg); | 343 | if(on_failure) on_failure(x,stat,ecode,emsg); |
340 | } | 344 | } |
341 | }else{ | 345 | }else{ |
342 | if(on_failure) on_failure(x); | 346 | if(on_failure) on_failure(x); |
343 | } | 347 | } |
344 | return true; | 348 | return true; |
345 | }; | 349 | }; |
346 | x.send(pbs.newInputStream(0)); | 350 | x.send(pbs.newInputStream(0)); |
347 | }catch(e) { | 351 | }catch(e) { |
348 | if(on_failure) on_failure(e,null,-1,e.message); | 352 | if(on_failure) on_failure(e,null,-1,e.message); |
349 | } | 353 | } |
350 | } | 354 | } |
351 | 355 | ||
352 | }; | 356 | }; |