yanglc
/
OneManager-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: list all files (include trashed)

pull/240/head
qkqpttgf 2021-03-04 15:56:35 +08:00 committed by GitHub
parent cba994cf41
commit ae14fd6ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
disk/Googledrive.php
View File

@ -71,7 +71,7 @@ class Googledrive {
$tmp['list'][$filename]['type'] = 'file'; $tmp['list'][$filename]['type'] = 'file';
//var_dump($file); //var_dump($file);
//echo $file['name'] . ':' . $this->DownurlStrName . ':' . $file[$this->DownurlStrName] . PHP_EOL; //echo $file['name'] . ':' . $this->DownurlStrName . ':' . $file[$this->DownurlStrName] . PHP_EOL;
$tmp['list'][$filename]['url'] = $file['webContentLink']; $tmp['list'][$filename]['url'] = ($file['downUrl']?$file['downUrl']:$file['webContentLink']);
$tmp['list'][$filename]['mime'] = $file['mimeType']; $tmp['list'][$filename]['mime'] = $file['mimeType'];
} }
$tmp['list'][$filename]['id'] = $file['id']; $tmp['list'][$filename]['id'] = $file['id'];
@ -86,7 +86,7 @@ class Googledrive {
$tmp['time'] = $files['modifiedTime']; $tmp['time'] = $files['modifiedTime'];
$tmp['size'] = $files['size']; $tmp['size'] = $files['size'];
$tmp['mime'] = $files['mimeType']; $tmp['mime'] = $files['mimeType'];
$tmp['url'] = $files['webContentLink']; $tmp['url'] = ($files['downUrl']?$files['downUrl']:$files['webContentLink']);
$tmp['content'] = $files['content']; $tmp['content'] = $files['content'];
} else/*if (isset($files['error']))*/ { } else/*if (isset($files['error']))*/ {
return $files; return $files;
@ -125,23 +125,35 @@ class Googledrive {
$files['time'] = $item['modifiedTime']; $files['time'] = $item['modifiedTime'];
$files['size'] = $item['size']; $files['size'] = $item['size'];
} else { } else {
if (isset($item['id'])&&$item['shared']!==true) $this->permission('create', $item['id']);
//$this->permission('delete', $files['id']);
if (!isset($item['downUrl'])) {
$res = curl('GET', $item['webContentLink'], '', '', 1);
$weblink = $res['returnhead']['Location'];
if ($weblink!==null) $item['downUrl'] = $weblink;
else error_log1('Cant get link:' . json_encode($res, JSON_PRETTY_PRINT));
}
//if (isset($item['mimeType']) && $item['mimeType']!='application/vnd.google-apps.folder') { //if (isset($item['mimeType']) && $item['mimeType']!='application/vnd.google-apps.folder') {
if (in_array(splitlast($item['name'],'.')[1], $exts['txt'])) { if (in_array(splitlast($item['name'],'.')[1], $exts['txt'])) {
if (!(isset($item['content'])&&$item['content']['stat']==200)) { if (!(isset($item['content'])&&$item['content']['stat']==200)) {
$content1 = curl('GET', $item['webContentLink'], '', '', 1); if (isset($item['downUrl'])) {
//error_log1(json_encode($tmp, JSON_PRETTY_PRINT)); $content1 = curl('GET', $item['downUrl']);
if ($content1['stat']==302) { $item['content'] = $content1;
$content1 = curl('GET', $content1['returnhead']['Location'], '', ["User-Agent"=>"qkqpttgf/OneManager 3.0.0", "Accept"=>"*/*"], 1);
} }
error_log1($item['name'] . '~' . json_encode($content1, JSON_PRETTY_PRINT) . PHP_EOL); //else $content1 = $res;
$item['content'] = $content1;
//if ($content1['stat']==302) {
// $content1 = curl('GET', $content1['returnhead']['Location'], '', ["User-Agent"=>"qkqpttgf/OneManager 3.0.0", "Accept"=>"*/*"], 1);
//}
//error_log1($item['name'] . '~' . json_encode($content1, JSON_PRETTY_PRINT) . PHP_EOL);
//$item['content'] = $content1;
$parent_folder['files'][$i] = $item; $parent_folder['files'][$i] = $item;
savecache('path_' . $path, $parent_folder, $this->disktag); savecache('path_' . $path, $parent_folder, $this->disktag);
} }
} }
if (isset($item['id'])&&$item['shared']===false) $this->permission('create', $item['id']);
//$this->permission('delete', $files['id']);
//} //}
//error_log1(json_encode($item, JSON_PRETTY_PRINT));
$files = $item; $files = $item;
} }
} }
@ -169,8 +181,19 @@ class Googledrive {
protected function fileList($parent_file_id = '') protected function fileList($parent_file_id = '')
{ {
$url = $this->api_url . 'files'; $url = $this->api_url . 'files';
if ($parent_file_id!='') $url .= '/' . $parent_file_id;
$url .= '?fields=files(id,name,mimeType,size,modifiedTime,parents,webContentLink,thumbnailLink,shared,permissions,permissionIds),nextPageToken'; $url .= '?fields=files(id,name,mimeType,size,modifiedTime,parents,webContentLink,thumbnailLink,shared,permissions,permissionIds),nextPageToken';
//$url .= '?fields=files(*),nextPageToken';
//$url .= '?q=mimeType=\'application/vnd.google-apps.folder\'';
if ($parent_file_id!='') {
$q = ${parent_file_id};
} else {
if ($this->default_drive_id!='') $q = $this->default_drive_id;
else $q = 'root';
}
$q = '\'' . $q . '\' in parents and trashed = false';
$q = urlencode($q);
$url .= '&q=' . $q;
if ($this->default_drive_id!='') $url .= '&driveId=' . $this->default_drive_id . '&corpora=teamDrive&includeItemsFromAllDrives=true&supportsAllDrives=true'; if ($this->default_drive_id!='') $url .= '&driveId=' . $this->default_drive_id . '&corpora=teamDrive&includeItemsFromAllDrives=true&supportsAllDrives=true';
$header['Authorization'] = 'Bearer ' . $this->access_token; $header['Authorization'] = 'Bearer ' . $this->access_token;
@ -199,7 +222,7 @@ class Googledrive {
$header['Authorization'] = 'Bearer ' . $this->access_token; $header['Authorization'] = 'Bearer ' . $this->access_token;
$res = curl($method, $url, $data, $header); $res = curl($method, $url, $data, $header);
//error_log1(json_encode($res, JSON_PRETTY_PRINT)); //error_log1('Set Share' . json_encode($res, JSON_PRETTY_PRINT));
return $res; return $res;
} }