1 files changed, 29 insertions, 36 deletions

diff --git a/content/flickr.js b/content/flickr.js
index 545144c..716874b 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -1,206 +1,199 @@
 /*
  * Photoset
  */
 
 function Photoset(s) {
  if(s instanceof Photoset) {
    for(var p in s) this[p]=s[p];
  }else
-  this.fromNode(s);
+  this.fromJSON(s);
 }
 Photoset.prototype = {
  id: null,
  primary: null,
  secret: null,
  server: null,
  photos: null,
  title: null,
  description: null,
- fromNode: function(n) {
-  this.id = n.getAttribute('id');
-  this.primary = n.getAttribute('primary');
-  this.secret = n.getAttribute('secret');
-  this.server = n.getAttribute('server');
-  this.photos = n.getAttribute('photos');
-  this.title = n.getElementsByTagName('title').item(0).firstChild.nodeValue;
-  this.description = n.getElementsByTagName('description').item(0).firstChild;
-  if(this.description) this.description = this.description.nodeValue;
+ fromJSON: function(j) {
+  this.id=j.id;
+  this.primary = j.primary;
+  this.secret = j.secret; this.server = j.server;
+  this.photos = j.photos;
+  this.title = j.title._content;
+  this.description = j.description._content;
  }
 };
 
 /*
  * Photo
  */
 function Photo(s) {
  if(s instanceof Photo) {
   for(var p in s) this[p]=s[p];
  }else
-  this.fromNode(s);
+  this.fromJSON(s);
 }
 Photo.prototype = {
  id: null, secret: null,
  server: null,
  title: null,
  isprimary: null,
  license: null,
  dateupload: null, datetaken: null, datetakengranularity: null,
  ownername: null,
  iconserver: null,
  originalformat: null,
  lastupdate: null,
- fromNode: function(n) {
-  this.id = n.getAttribute('id'); this.secret = n.getAttribute('secret');
-  this.server = n.getAttribute('server');
-  this.title = n.getAttribute('title');
-  this.isprimary = n.getAttribute('isprimary');
-  this.license = n.getAttribute('license');
-  this.dateupload = n.getAttribute('dateupload');
-  this.datetaken = n.getAttribute('datetaken'); this.datetakengranularity = n.getAttribute('datetakengranularity');
-  this.ownername = n.getAttribute('ownername');
-  this.iconserver = n.getAttribute('iconserver');
-  this.originalformat = n.getAttribute('originalformat');
-  this.lastupdate = n.getAttribute('lastupdate');
+ fromJSON: function(j) {
+  this.id = j.id; this.secret = j.secret;
+  this.server = j.server;
+  this.title=j.title;
+  this.isprimary = j.isprimary;
+  this.license = j.license;
+  this.dateupload = j.dateupload;
+  this.datetaken=j.datetaken; j.datetakengranularity=j.datetakengranularity;
+  this.ownername=j.ownername;
+  this.iconserver=j.iconserver;
+  this.originalformat=j.originalformat;
+  this.lastupdate=j.lastupdate;
  },
- fromNode_: function(n) {
-  var t;
-  // TODO: @rotation @isfavorite
+ fromJSON_: function(j) {
   this.owner = {};
-  t = n.getElementsByTagName('owner').item(0);
-  if(t) {
-   this.owner.nsid=t.getAttribute('nsid');
-   this.owner.username=t.getAttribute('username');
-   this.owner.realname=t.getAttribute('realname');
-   this.owner.location=t.getAttribute.location;
-  }
-  t = n.getElementsByTagName('description').item(0);
-  if(t && t.firstChild) {
-   this.description = t.firstChild.nodeValue;
+  var t;
+  if((t=j.owner)) {
+   this.owner.nsid=t.nsid;
+   this.owner.username=t.username; this.owner.realname=t.realname;
+   this.owner.location=t.location;
   }
+  if((t=j.description)) this.description=t._content;
+  // TODO: @rotation @isfavorite
   // TODO: visibility/@ispublic visibility/@isfriend visibility/@isfamily 
   // TODO: dates/@posted dates/@taken dates/@takengranularity dates/@lastupdate
   // TODO: permissions/@permcomment permsiions/@permaddmeta
   // TODO: editability/@canaddcomment editability/@canaddmeta
   // TODO: comments
   // TODO: notes/note/@id notes/note/@author notes/note/@authorname
   // TODO: notes/note/@x notes/note/@y notes/note/@w notes/note/@h
   // TODO: notes/note
   // TODO: tags/tag/@id tags/tag/@author tags/tag/@raw tags/tag
   // TODO: urls/url/@type urls/url
  }
 };
 
 function Flickr() { }
 Flickr.prototype = {
 
  rest_url: 'http://www.flickr.com/services/rest/',
  auth_url: 'http://flickr.com/services/auth/',
  photo_url: 'http://static.flickr.com/',
  photos_url: 'http://www.flickr.com/photos/',
  upload_url: 'http://www.flickr.com/services/upload/',
  uploader_edit_url: 'http://www.flickr.com/tools/uploader_edit.gne',
 
  api_sig: function(paramstr) {
   return MD5(toutf8(this.api_shs+paramstr));
  },
  api_call_url: function(params,url) {
   params.api_key = this.api_key;
   var pp = new Array();
   for(var p in params) {
    pp.push(p);
   }
   var pstr = '';
   var rv = (url?url:this.rest_url)+'?';
   for(var p in pp.sort()) {
    var pn = pp[p];
    pstr += pn+params[pn];
    rv += pn+'='+params[pn]+'&';
   }
   rv += 'api_sig='+this.api_sig(pstr);
   return rv;
  },
  api_call_json: function(params,on_success,on_failure) {
   if(params.auth_token=='default') params.auth_token=this.token;
   params.format = 'json'; params.nojsoncallback=1;
   var x = new XMLHttpRequest();
   x.open("GET",this.api_call_url(params));
   x.onreadystatechange=function() {
    if(x.readyState!=4) return false;
    if(x.status==200) {
     var rsp=JSON.parse(x.responseText);
     if(rsp.stat=='ok')
      on_success && on_success(x,rsp);
     else
      on_failure && on_failure(rsp,rsp.stat,rsp.code,rsp.message);
    }else
     on_failure && on_failure(x);
    return true;
   };
   x.send(null);
   return true;
  },
  api_call: function(params, on_success, on_failure) {
   if(params.auth_token == 'default')
    params.auth_token = this.token;
   var x = new XMLHttpRequest();
   x.open("GET",this.api_call_url(params));
   x.onreadystatechange=function() {
    if(x.readyState!=4) return false;
    if(x.status==200) {
     var stat = x.responseXML.firstChild.getAttribute('stat');
     if(stat=='ok') {
      if(on_success) on_success(x);
     }else{
      var e = x.responseXML.getElementsByTagName('err').item(0);
      var ecode = e.getAttribute('code');
      var emsg = e.getAttribute('msg');
      dump(params.method+' failed: '+ecode+' '+emsg+'\n');
      if(on_failure) on_failure(x,stat,ecode,emsg);
     }
    }else{
     if(on_failure) on_failure(x);
    }
    return true;
   }
   x.send(null);
   return true;
  },
 
  frob: null,
  authorize_0: function(perms, on_s, on_f) {
   var _this = this;
   this.api_call(
    { method: 'flickr.auth.getFrob' },
    function(x) {
     _this.frob = xp_str('/rsp/frob',x.responseXML);
     var u = _this.api_call_url(
      { frob: _this.frob, perms: perms?perms:'delete' }, _this.auth_url );
     if(on_s) on_s(x,_this.frob,u);
    }, function(x,s,c,m) {
     if(on_f) on_f(x,s,c,m);
    }
   );
  },
  token: null,
  perms: null,
  user: null,
  authorize_1: function(on_s, on_f) {
   var _this = this;
   this.api_call(
    { method: 'flickr.auth.getToken', frob: this.frob },
    function(x) {
     _this.token = xp_str('/rsp/auth/token',x.responseXML);
     _this.perms = xp_str('/rsp/auth/perms',x.responseXML);
     var u = xp_node('/rsp/auth/user',x.responseXML);
     _this.user = {
      nsid: u.getAttribute('nsid'),
      username: u.getAttribute('username'),
      fullname: u.getAttribute('fullname')
     };
     if(on_s) on_s(x);
    }, function(x,s,c,m) {
     if(on_f) on_f(x,s,c,m);
    }
   );
  },
 
  prefs: Components.classes['@mozilla.org/preferences-service;1'].getService(