Skip to content

Commit

Permalink
keep onedrive consistent with other providers
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkferg committed Nov 27, 2014
1 parent 01d7bf4 commit ba91bf6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
19 changes: 12 additions & 7 deletions lib/client.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

var q = require('q')
, fs = require('fs')
, url = require('url')
, path = require('path')
, extend = require('node.extend')
, request = require('request')
Expand Down Expand Up @@ -87,6 +89,9 @@ Client.prototype.deleteFile = function (identifier) {

Client.prototype.downloadFile = function (identifier) {
var self = this;
if (identifier.identifier){
identifier = identifier.identifier;
}
return self._getClient().then(function (client) {
var deferred = q.defer();
client.get(
Expand Down Expand Up @@ -194,16 +199,16 @@ Client.prototype.searchFiles = function (filters,options){
} else {
params.q="*";
}
if (options.maxResults){
params.limit = options.maxResults;
if (options.max_results){
params.limit = options.max_results;
}
if (options.nextPageToken){
params.offset = options.nextPageToken;
if (options.page_token){
params.offset = options.page_token;
}
// If there is a nextPageToken, use that as the url
// Otherwise construct the url from params
if (options.nextPageToken){
_url = "https://apis.live.net/v5.0"+options.nextPageToken;
if (options.page_token){
_url = "https://apis.live.net/v5.0"+options.page_token;
} else {
_url = url.format({pathname:'https://apis.live.net/v5.0/me/skydrive/search',query:params});
}
Expand All @@ -216,7 +221,7 @@ Client.prototype.searchFiles = function (filters,options){
if (err) return deferred.reject(err);
var response = JSON.parse(body)
if (response.paging){
response.nextPageToken = response.paging.next;
response.page_token = response.paging.next;
}
return deferred.resolve(response);
}
Expand Down
2 changes: 2 additions & 0 deletions lib/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ transform.getFileInformation = function (file_response){
transform.modified_date = new Date(file_response.updated_time);
transform.name = file_response.name;
transform.description = file_response.description;
transform.download_url = 'https://apis.live.net/v5.0/'+file_response.id+'/content';
//transform.extension = file_response.name.split('.')
transform.checksum = null;
transform.file_size = file_response.size;
transform.page_token = file_response.page_token;
transform._raw = file_response;
return transform;
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "filefog-onedrive",
"version": "0.0.2",
"version": "0.0.5",
"description": "Microsoft onedrive (previously skydrive) provider for filefog",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit ba91bf6

Please sign in to comment.