-rw-r--r-- | content/fireflix.js | 4 | ||||
-rw-r--r-- | content/flickr.js | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 0f01d26..f180379 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -1,153 +1,155 @@ | |||
1 | function splitascii(s) { | 1 | function splitascii(s) { |
2 | var rv=''; | 2 | var rv=''; |
3 | for(var i=0;i<s.length;++i) { | 3 | for(var i=0;i<s.length;++i) { |
4 | var w = s.charCodeAt(i); | 4 | var w = s.charCodeAt(i); |
5 | rv += String.fromCharCode( | 5 | rv += String.fromCharCode( |
6 | w&0xff, (w>>8)&0xff ); | 6 | w&0xff, (w>>8)&0xff ); |
7 | } | 7 | } |
8 | return rv; | 8 | return rv; |
9 | } | 9 | } |
10 | 10 | ||
11 | 11 | ||
12 | var fireflix = { | 12 | var fireflix = { |
13 | flickr: new Flickr(), | 13 | flickr: new Flickr(), |
14 | init: function() { | 14 | init: function() { |
15 | pull_elements(this,document,[ | 15 | pull_elements(this,document,[ |
16 | 'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth', | 16 | 'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth', |
17 | 'menu_auth_done','b_auth','b_auth_done','auth_info', | 17 | 'menu_auth_done','b_auth','b_auth_done','auth_info', |
18 | 'loc_strings','cmd_set_props' | 18 | 'loc_strings','cmd_set_props' |
19 | ]); | 19 | ]); |
20 | this.build_menus(); | 20 | this.build_menus(); |
21 | this.foundphotos.init(this); | 21 | this.foundphotos.init(this); |
22 | this.photosets.init(this); | 22 | this.photosets.init(this); |
23 | this.photoset.init(this); | 23 | this.photoset.init(this); |
24 | this.uploads.init(this); | 24 | this.uploads.init(this); |
25 | this.uploadObserver.init(this); | 25 | this.uploadObserver.init(this); |
26 | this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3'; | 26 | this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3'; |
27 | this.flickr.api_shs = '9c33c9e2f0f0cfd5'; | 27 | this.flickr.api_shs = '9c33c9e2f0f0cfd5'; |
28 | this.flickr.prefs_root = 'net.klever.kin.fireflix'; | 28 | this.flickr.prefs_root = 'net.klever.kin.fireflix'; |
29 | this.flickr.load_token(); | 29 | this.flickr.load_token(); |
30 | document.getElementById('setslist').view = this.photosets; | 30 | document.getElementById('setslist').view = this.photosets; |
31 | document.getElementById('setphotos').view = this.photoset; | 31 | document.getElementById('setphotos').view = this.photoset; |
32 | document.getElementById('uploadlist').view = this.uploads; | 32 | document.getElementById('uploadlist').view = this.uploads; |
33 | this.no_auth_info_label = this.auth_info.value; | 33 | this.no_auth_info_label = this.auth_info.value; |
34 | this.set_auth_state(this.flickr.token,false); | 34 | this.set_auth_state(this.flickr.token,false); |
35 | if(this.flickr.token) { | 35 | if(this.flickr.token) { |
36 | this.refresh_stuff(); | 36 | this.refresh_stuff(); |
37 | }else{ | 37 | }else{ |
38 | this.on_cmd_auth(); | 38 | this.on_cmd_auth(); |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | set_auth_state: function(au,inp) { /* authorized, in progress */ | 41 | set_auth_state: function(au,inp) { /* authorized, in progress */ |
42 | this.cmd_auth_unauth.disabled = !au; | 42 | this.cmd_auth_unauth.disabled = !au; |
43 | this.b_auth.hidden = au || inp; | 43 | this.b_auth.hidden = au || inp; |
44 | this.b_auth_done.hidden = !inp; | 44 | this.b_auth_done.hidden = !inp; |
45 | this.menu_auth_done.hidden = !inp; | 45 | this.menu_auth_done.hidden = !inp; |
46 | this.cmd_auth_done.setAttribute('disabled',!inp); | 46 | this.cmd_auth_done.setAttribute('disabled',!inp); |
47 | this.auth_info.disabled = !au; | 47 | this.auth_info.disabled = !au; |
48 | if(au) { | 48 | if(au) { |
49 | this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ | 49 | this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ |
50 | }else{ | 50 | }else{ |
51 | this.auth_info.value = this.no_auth_info_label; | 51 | this.auth_info.value = this.no_auth_info_label; |
52 | } | 52 | } |
53 | }, | 53 | }, |
54 | on_cmd_auth: function() { | 54 | on_cmd_auth: function() { |
55 | var _this = this; | 55 | var _this = this; |
56 | this.flickr.authorize_0( | 56 | this.flickr.authorize_0( |
57 | function() { | 57 | 'delete', |
58 | function(x,f,u) { | ||
59 | _this.openTab(u); | ||
58 | _this.set_auth_state(_this.flickr.token,true); | 60 | _this.set_auth_state(_this.flickr.token,true); |
59 | }, function(x,s,c,m) { | 61 | }, function(x,s,c,m) { |
60 | _this.flickr_failure(x,s,c,m); | 62 | _this.flickr_failure(x,s,c,m); |
61 | } | 63 | } |
62 | ); | 64 | ); |
63 | }, | 65 | }, |
64 | on_cmd_auth_done: function() { | 66 | on_cmd_auth_done: function() { |
65 | this.set_auth_state(this.flickr.token,false); | 67 | this.set_auth_state(this.flickr.token,false); |
66 | var _this = this; | 68 | var _this = this; |
67 | this.flickr.authorize_1( | 69 | this.flickr.authorize_1( |
68 | function() { | 70 | function() { |
69 | _this.flickr.save_token(); | 71 | _this.flickr.save_token(); |
70 | _this.refresh_stuff(); | 72 | _this.refresh_stuff(); |
71 | _this.set_auth_state(_this.flickr.token,false); | 73 | _this.set_auth_state(_this.flickr.token,false); |
72 | _this.auth_info.value = | 74 | _this.auth_info.value = |
73 | _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; | 75 | _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; |
74 | }, function(x,s,c,m) { | 76 | }, function(x,s,c,m) { |
75 | _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */ | 77 | _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */ |
76 | _this.flickr_failure(x,s,c,m); | 78 | _this.flickr_failure(x,s,c,m); |
77 | } | 79 | } |
78 | ); | 80 | ); |
79 | }, | 81 | }, |
80 | on_cmd_auth_unauth: function() { | 82 | on_cmd_auth_unauth: function() { |
81 | this.flickr.reset_token(); | 83 | this.flickr.reset_token(); |
82 | this.set_auth_state(false,false); | 84 | this.set_auth_state(false,false); |
83 | }, | 85 | }, |
84 | 86 | ||
85 | refresh_sets: function() { this.photosets.refresh_sets(); }, | 87 | refresh_sets: function() { this.photosets.refresh_sets(); }, |
86 | refresh_stuff: function() { | 88 | refresh_stuff: function() { |
87 | this.refresh_sets(); | 89 | this.refresh_sets(); |
88 | this.refresh_user_tags(); | 90 | this.refresh_user_tags(); |
89 | }, | 91 | }, |
90 | 92 | ||
91 | /* photoset treeview */ | 93 | /* photoset treeview */ |
92 | photoset: { | 94 | photoset: { |
93 | photos: new Array(), | 95 | photos: new Array(), |
94 | fireflix: null, | 96 | fireflix: null, |
95 | init: function(f) { | 97 | init: function(f) { |
96 | this.fireflix = f; | 98 | this.fireflix = f; |
97 | pull_elements(this,document,[ 'set_photo' ]); | 99 | pull_elements(this,document,[ 'set_photo' ]); |
98 | }, | 100 | }, |
99 | rowCount: 0, | 101 | rowCount: 0, |
100 | getCellText: function(r,c) { | 102 | getCellText: function(r,c) { |
101 | var p = this.photos[r]; | 103 | var p = this.photos[r]; |
102 | if(c.id=='sp_title') return p.title; | 104 | if(c.id=='sp_title') return p.title; |
103 | if(c.id=='sp_taken') return p.datetaken; | 105 | if(c.id=='sp_taken') return p.datetaken; |
104 | if(c.id=='sp_upload') return p.dateupload; /* TODO: unixtime conversion */ | 106 | if(c.id=='sp_upload') return p.dateupload; /* TODO: unixtime conversion */ |
105 | return c.id; | 107 | return c.id; |
106 | }, | 108 | }, |
107 | setTree: function(t) { this.tree = t }, | 109 | setTree: function(t) { this.tree = t }, |
108 | isContainer: function(r) { return false; }, | 110 | isContainer: function(r) { return false; }, |
109 | isSeparator: function(r) { return false; }, | 111 | isSeparator: function(r) { return false; }, |
110 | isSorted: function(r) { return false; }, | 112 | isSorted: function(r) { return false; }, |
111 | getLevel: function(r) { return 0; }, | 113 | getLevel: function(r) { return 0; }, |
112 | getImageSrc: function(r,c) { return null }, | 114 | getImageSrc: function(r,c) { return null }, |
113 | getRowProperties: function(r,p) {}, | 115 | getRowProperties: function(r,p) {}, |
114 | getCellProperties: function(cid,cel,p) {}, | 116 | getCellProperties: function(cid,cel,p) {}, |
115 | getColumnProperties: function(cid,cel,p) { }, | 117 | getColumnProperties: function(cid,cel,p) { }, |
116 | cycleHeader: function(cid,e) { }, | 118 | cycleHeader: function(cid,e) { }, |
117 | getParentIndex: function(r) { return -1; }, | 119 | getParentIndex: function(r) { return -1; }, |
118 | drop: function(r,o) { }, | 120 | drop: function(r,o) { }, |
119 | canDropBeforeAfter: function(r,b) { return false }, | 121 | canDropBeforeAfter: function(r,b) { return false }, |
120 | 122 | ||
121 | importXPR: function(xp) { | 123 | importXPR: function(xp) { |
122 | this.tree.beginUpdateBatch(); | 124 | this.tree.beginUpdateBatch(); |
123 | this.photos = new Array(); | 125 | this.photos = new Array(); |
124 | var n; while(n=xp.iterateNext()) { | 126 | var n; while(n=xp.iterateNext()) { |
125 | this.photos.push(new Photo(n)); | 127 | this.photos.push(new Photo(n)); |
126 | } | 128 | } |
127 | this.rowCount = this.photos.length; | 129 | this.rowCount = this.photos.length; |
128 | this.tree.endUpdateBatch(); | 130 | this.tree.endUpdateBatch(); |
129 | }, | 131 | }, |
130 | load_photos: function(psid) { | 132 | load_photos: function(psid) { |
131 | var _this = this; | 133 | var _this = this; |
132 | this.fireflix.flickr.api_call( | 134 | this.fireflix.flickr.api_call( |
133 | { | 135 | { |
134 | method: 'flickr.photosets.getPhotos', | 136 | method: 'flickr.photosets.getPhotos', |
135 | auth_token: 'default', | 137 | auth_token: 'default', |
136 | photoset_id: psid, | 138 | photoset_id: psid, |
137 | extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update' | 139 | extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update' |
138 | }, function(xr) { | 140 | }, function(xr) { |
139 | var x = xr.responseXML; | 141 | var x = xr.responseXML; |
140 | var xp = x.evaluate( | 142 | var xp = x.evaluate( |
141 | '/rsp/photoset/photo', x, null, | 143 | '/rsp/photoset/photo', x, null, |
142 | XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); | 144 | XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); |
143 | _this.importXPR(xp); | 145 | _this.importXPR(xp); |
144 | }, function(x,s,c,m) { | 146 | }, function(x,s,c,m) { |
145 | _this.fireflix.flickr_failure(x,s,c,m); | 147 | _this.fireflix.flickr_failure(x,s,c,m); |
146 | } | 148 | } |
147 | ); | 149 | ); |
148 | }, | 150 | }, |
149 | on_select: function() { | 151 | on_select: function() { |
150 | if(this.selection.count==1) { | 152 | if(this.selection.count==1) { |
151 | var p = this.photos[this.selection.currentIndex]; | 153 | var p = this.photos[this.selection.currentIndex]; |
152 | this.set_photo.src = | 154 | this.set_photo.src = |
153 | this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); | 155 | this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); |
diff --git a/content/flickr.js b/content/flickr.js index add628a..b5bfa43 100644 --- a/content/flickr.js +++ b/content/flickr.js | |||
@@ -52,207 +52,201 @@ Photo.prototype = { | |||
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(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: 'delete' }, _this.auth_url ); | 155 | { frob: _this.frob, perms: perms?perms:'delete' }, _this.auth_url ); |
156 | var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService( | 156 | if(on_s) on_s(x,_this.frob,u); |
157 | Components.interfaces.nsIWindowMediator ); | ||
158 | var bw = wm.getMostRecentWindow('navigator:browser'); | ||
159 | var b = bw.getBrowser(); | ||
160 | var t = b.addTab(u); | ||
161 | b.selectedTab = t; | ||
162 | if(on_s) on_s(); | ||
163 | }, function(x,s,c,m) { | 157 | }, function(x,s,c,m) { |
164 | if(on_f) on_f(x,s,c,m); | 158 | if(on_f) on_f(x,s,c,m); |
165 | } | 159 | } |
166 | ); | 160 | ); |
167 | }, | 161 | }, |
168 | token: null, | 162 | token: null, |
169 | perms: null, | 163 | perms: null, |
170 | user: null, | 164 | user: null, |
171 | authorize_1: function(on_s, on_f) { | 165 | authorize_1: function(on_s, on_f) { |
172 | var _this = this; | 166 | var _this = this; |
173 | this.api_call( | 167 | this.api_call( |
174 | { method: 'flickr.auth.getToken', frob: this.frob }, | 168 | { method: 'flickr.auth.getToken', frob: this.frob }, |
175 | function(x) { | 169 | function(x) { |
176 | _this.token = xp_str('/rsp/auth/token',x.responseXML); | 170 | _this.token = xp_str('/rsp/auth/token',x.responseXML); |
177 | _this.perms = xp_str('/rsp/auth/perms',x.responseXML); | 171 | _this.perms = xp_str('/rsp/auth/perms',x.responseXML); |
178 | var u = xp_node('/rsp/auth/user',x.responseXML); | 172 | var u = xp_node('/rsp/auth/user',x.responseXML); |
179 | _this.user = { | 173 | _this.user = { |
180 | nsid: u.getAttribute('nsid'), | 174 | nsid: u.getAttribute('nsid'), |
181 | username: u.getAttribute('username'), | 175 | username: u.getAttribute('username'), |
182 | fullname: u.getAttribute('fullname') | 176 | fullname: u.getAttribute('fullname') |
183 | }; | 177 | }; |
184 | if(on_s) on_s(x); | 178 | if(on_s) on_s(x); |
185 | }, function(x,s,c,m) { | 179 | }, function(x,s,c,m) { |
186 | if(on_f) on_f(x,s,c,m); | 180 | if(on_f) on_f(x,s,c,m); |
187 | } | 181 | } |
188 | ); | 182 | ); |
189 | }, | 183 | }, |
190 | 184 | ||
191 | prefs: Components.classes['@mozilla.org/preferences-service;1'].getService( | 185 | prefs: Components.classes['@mozilla.org/preferences-service;1'].getService( |
192 | Components.interfaces.nsIPrefBranch | 186 | Components.interfaces.nsIPrefBranch |
193 | ), | 187 | ), |
194 | prefs_root: 'net.klever.kin.flickr', | 188 | prefs_root: 'net.klever.kin.flickr', |
195 | save_token: function() { | 189 | save_token: function() { |
196 | // 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 |
197 | if(this.token) | 191 | if(this.token) |
198 | this.prefs.setCharPref(this.prefs_root+'.auth_token',this.token); | 192 | this.prefs.setCharPref(this.prefs_root+'.auth_token',this.token); |
199 | else | 193 | else |
200 | this.prefs.clearUserPref(this.prefs_root+'.auth_token'); | 194 | this.prefs.clearUserPref(this.prefs_root+'.auth_token'); |
201 | if(this.perms) | 195 | if(this.perms) |
202 | this.prefs.setCharPref(this.prefs_root+'.auth_perms',this.perms); | 196 | this.prefs.setCharPref(this.prefs_root+'.auth_perms',this.perms); |
203 | else | 197 | else |
204 | this.prefs.clearUserPref(this.prefs_root+'.auth_perms'); | 198 | this.prefs.clearUserPref(this.prefs_root+'.auth_perms'); |
205 | if(this.user && this.user.nsid!=null && this.user.nsid!=undefined) | 199 | if(this.user && this.user.nsid!=null && this.user.nsid!=undefined) |
206 | 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); |
207 | else | 201 | else |
208 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.nsid'); | 202 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.nsid'); |
209 | if(this.user && this.user.username!=null && this.user.username!=undefined) | 203 | if(this.user && this.user.username!=null && this.user.username!=undefined) |
210 | 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); |
211 | else | 205 | else |
212 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.username'); | 206 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.username'); |
213 | if(this.user && this.user.fullname!=null && this.user.fullname!=undefined) | 207 | if(this.user && this.user.fullname!=null && this.user.fullname!=undefined) |
214 | 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); |
215 | else | 209 | else |
216 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.fullname'); | 210 | this.prefs.clearUserPref(this.prefs_root+'.auth_user.fullname'); |
217 | }, | 211 | }, |
218 | _reset_token: function() { | 212 | _reset_token: function() { |
219 | this.token = null; this.perms = null; this.user = null; | 213 | this.token = null; this.perms = null; this.user = null; |
220 | return false; | 214 | return false; |
221 | }, | 215 | }, |
222 | load_token: function() { | 216 | load_token: function() { |
223 | try { | 217 | try { |
224 | 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) |
225 | return this._reset_token(); | 219 | return this._reset_token(); |
226 | this.token = this.prefs.getCharPref(this.prefs_root+'.auth_token'); | 220 | this.token = this.prefs.getCharPref(this.prefs_root+'.auth_token'); |
227 | 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) |
228 | return this._reset_token(); | 222 | return this._reset_token(); |
229 | this.perms = this.prefs.getCharPref(this.prefs_root+'.auth_perms'); | 223 | this.perms = this.prefs.getCharPref(this.prefs_root+'.auth_perms'); |
230 | 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) |
231 | return this._reset_token(); | 225 | return this._reset_token(); |
232 | this.user = new Object(); | 226 | this.user = new Object(); |
233 | 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'); |
234 | 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) |
235 | return this._reset_token(); | 229 | return this._reset_token(); |
236 | 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'); |
237 | 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) |
238 | return this._reset_token(); | 232 | return this._reset_token(); |
239 | 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'); |
240 | }catch(e) { return this._reset_token(); } | 234 | }catch(e) { return this._reset_token(); } |
241 | return true; | 235 | return true; |
242 | }, | 236 | }, |
243 | reset_token: function() { | 237 | reset_token: function() { |
244 | this._reset_token(); | 238 | this._reset_token(); |
245 | this.save_token(); | 239 | this.save_token(); |
246 | }, | 240 | }, |
247 | 241 | ||
248 | get_photo_url: function(ser,id,sec,sfx,ext) { | 242 | get_photo_url: function(ser,id,sec,sfx,ext) { |
249 | var rv = this.photo_url + ser + '/' + id + '_' + sec; | 243 | var rv = this.photo_url + ser + '/' + id + '_' + sec; |
250 | if(sfx && sfx!='_') rv += '_'+sfx; | 244 | if(sfx && sfx!='_') rv += '_'+sfx; |
251 | rv += ext?'.'+ext:'.jpg'; | 245 | rv += ext?'.'+ext:'.jpg'; |
252 | return rv; | 246 | return rv; |
253 | }, | 247 | }, |
254 | get_image_url: function(o,sfx) { | 248 | get_image_url: function(o,sfx) { |
255 | return this.get_photo_url( | 249 | return this.get_photo_url( |
256 | o.server, | 250 | o.server, |
257 | (o instanceof Photoset)? o.primary : o.id, | 251 | (o instanceof Photoset)? o.primary : o.id, |
258 | o.secret, | 252 | o.secret, |