@@ -1303,7 +1303,7 @@ angular.module("web").factory("ossSvs2", [
1303
1303
}
1304
1304
1305
1305
function setMeta2 ( region , bucket , key , headers , meta ) {
1306
- const client = getClient2 ( { region, bucket } ) ;
1306
+ const client = getClient3 ( { region, bucket } ) ;
1307
1307
return client
1308
1308
. copy ( key , key , {
1309
1309
headers,
@@ -1339,7 +1339,30 @@ angular.module("web").factory("ossSvs2", [
1339
1339
1340
1340
function listFiles ( region , bucket , key , marker ) {
1341
1341
return new Promise ( function ( a , b ) {
1342
- _listFilesOrigion ( region , bucket , key , marker ) . then (
1342
+ let ready = [ ] ;
1343
+
1344
+ function get ( m ) {
1345
+ return _listFilesOrigion ( region , bucket , key , m ) . then ( ( result ) => {
1346
+ if ( result . data ) {
1347
+ ready = ready . concat ( result . data ) ;
1348
+ if (
1349
+ ready . length < result . maxKeys &&
1350
+ result . truncated &&
1351
+ result . marker
1352
+ ) {
1353
+ return get ( result . marker ) ;
1354
+ }
1355
+ }
1356
+ return {
1357
+ data : ready ,
1358
+ marker : result . marker ,
1359
+ truncated : result . truncated ,
1360
+ maxKeys : result . maxKeys ,
1361
+ } ;
1362
+ } ) ;
1363
+ }
1364
+
1365
+ get ( marker ) . then (
1343
1366
function ( result ) {
1344
1367
var arr = result . data ;
1345
1368
if ( arr && arr . length ) {
@@ -1469,6 +1492,8 @@ angular.module("web").factory("ossSvs2", [
1469
1492
resolve ( {
1470
1493
data : t_pre . concat ( t ) ,
1471
1494
marker : result . NextMarker ,
1495
+ truncated : result . IsTruncated ,
1496
+ maxKeys : result . MaxKeys ,
1472
1497
} ) ;
1473
1498
} ) ;
1474
1499
} ) ;
@@ -1663,6 +1688,7 @@ angular.module("web").factory("ossSvs2", [
1663
1688
} else
1664
1689
Toast . error ( err . code + ": " + err . message , undefined , err . requestId ) ;
1665
1690
}
1691
+ return Promise . reject ( err ) ;
1666
1692
}
1667
1693
1668
1694
/**
0 commit comments