@@ -68,7 +68,7 @@ countlyFs.gridfs = {};
68
68
**/
69
69
function beforeSave ( category , filename , options , callback , done ) {
70
70
log . d ( "checking file" , filename ) ;
71
- ob . getId ( category , filename , function ( err , res ) {
71
+ ob . getId ( category , filename , async function ( err , res ) {
72
72
log . d ( "file state" , filename , err , res ) ;
73
73
if ( options . forceClean ) {
74
74
ob . clearFile ( category , filename , done ) ;
@@ -80,15 +80,20 @@ countlyFs.gridfs = {};
80
80
else if ( options . writeMode === "overwrite" ) {
81
81
var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
82
82
log . d ( "deleting file" , filename ) ;
83
- bucket . delete ( res , function ( error ) {
84
- log . d ( "deleted" , filename , error ) ;
85
- if ( ! error ) {
86
- setTimeout ( done , 1 ) ;
87
- }
88
- else if ( callback ) {
89
- callback ( error ) ;
90
- }
91
- } ) ;
83
+ let errHandle = null ;
84
+ try {
85
+ await bucket . delete ( res ) ;
86
+ }
87
+ catch ( error ) {
88
+ errHandle = error ;
89
+ }
90
+ log . d ( "deleted" , filename , errHandle ) ;
91
+ if ( ! errHandle ) {
92
+ setTimeout ( done , 1 ) ;
93
+ }
94
+ else if ( callback ) {
95
+ callback ( errHandle ) ;
96
+ }
92
97
}
93
98
else {
94
99
if ( callback ) {
@@ -271,7 +276,7 @@ countlyFs.gridfs = {};
271
276
* console.log("Finished", err);
272
277
* });
273
278
*/
274
- ob . rename = function ( category , dest , source , options , callback ) {
279
+ ob . rename = async function ( category , dest , source , options , callback ) {
275
280
var newname = dest . split ( path . sep ) . pop ( ) ;
276
281
var oldname = source . split ( path . sep ) . pop ( ) ;
277
282
if ( typeof options === "function" ) {
@@ -284,22 +289,32 @@ countlyFs.gridfs = {};
284
289
285
290
if ( options . id ) {
286
291
let bucket = new GridFSBucket ( db , { bucketName : category } ) ;
287
- bucket . rename ( options . id , newname , function ( error ) {
288
- if ( callback ) {
289
- callback ( error ) ;
290
- }
291
- } ) ;
292
+ let errHandle = null ;
293
+ try {
294
+ await bucket . rename ( options . id , newname ) ;
295
+ }
296
+ catch ( error ) {
297
+ errHandle = error ;
298
+ }
299
+ if ( callback ) {
300
+ callback ( errHandle ) ;
301
+ }
292
302
}
293
303
else {
294
- db . collection ( category + ".files" ) . findOne ( { filename : oldname } , { _id : 1 } , function ( err , res ) {
304
+ db . collection ( category + ".files" ) . findOne ( { filename : oldname } , { _id : 1 } , async function ( err , res ) {
295
305
if ( ! err ) {
296
306
if ( res && res . _id ) {
297
307
let bucket = new GridFSBucket ( db , { bucketName : category } ) ;
298
- bucket . rename ( res . _id , newname , function ( error ) {
299
- if ( callback ) {
300
- callback ( error ) ;
301
- }
302
- } ) ;
308
+ let errHandle = null ;
309
+ try {
310
+ await bucket . rename ( res . _id , newname ) ;
311
+ }
312
+ catch ( error ) {
313
+ errHandle = error ;
314
+ }
315
+ if ( callback ) {
316
+ callback ( errHandle ) ;
317
+ }
303
318
}
304
319
else {
305
320
if ( callback ) {
@@ -372,13 +387,18 @@ countlyFs.gridfs = {};
372
387
* console.log("Finished", err);
373
388
* });
374
389
*/
375
- ob . deleteAll = function ( category , dest , callback ) {
390
+ ob . deleteAll = async function ( category , dest , callback ) {
376
391
var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
377
- bucket . drop ( function ( error ) {
378
- if ( callback ) {
379
- callback ( error ) ;
380
- }
381
- } ) ;
392
+ let errHandle = null ;
393
+ try {
394
+ await bucket . drop ( ) ;
395
+ }
396
+ catch ( error ) {
397
+ errHandle = error ;
398
+ }
399
+ if ( callback ) {
400
+ callback ( errHandle ) ;
401
+ }
382
402
} ;
383
403
384
404
/**
@@ -603,16 +623,15 @@ countlyFs.gridfs = {};
603
623
*/
604
624
ob . deleteFileById = async function ( category , id , callback ) {
605
625
var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
626
+ let errHandle = null ;
606
627
try {
607
628
await bucket . delete ( id ) ;
608
- if ( callback ) {
609
- callback ( null ) ;
610
- }
611
629
}
612
- catch ( ee ) {
613
- if ( callback ) {
614
- callback ( ee ) ;
615
- }
630
+ catch ( error ) {
631
+ errHandle = error ;
632
+ }
633
+ if ( callback ) {
634
+ callback ( errHandle ) ;
616
635
}
617
636
} ;
618
637
0 commit comments