@@ -5779,7 +5779,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
5779
5779
var __importStar = ( this && this . __importStar ) || function ( mod ) {
5780
5780
if ( mod && mod . __esModule ) return mod ;
5781
5781
var result = { } ;
5782
- if ( mod != null ) for ( var k in mod ) if ( k !== "default" && Object . hasOwnProperty . call ( mod , k ) ) __createBinding ( result , mod , k ) ;
5782
+ if ( mod != null ) for ( var k in mod ) if ( k !== "default" && Object . prototype . hasOwnProperty . call ( mod , k ) ) __createBinding ( result , mod , k ) ;
5783
5783
__setModuleDefault ( result , mod ) ;
5784
5784
return result ;
5785
5785
} ;
@@ -5884,7 +5884,8 @@ function includeExcludeFilter(stat, args) {
5884
5884
}
5885
5885
function getLocalFiles ( args ) {
5886
5886
return __awaiter ( this , void 0 , void 0 , function ( ) {
5887
- var files , records , _i , files_1 , stat , _a , _b , _c ;
5887
+ var files , records , _i , files_1 , stat , _a , _b ;
5888
+ var _c ;
5888
5889
return __generator ( this , function ( _d ) {
5889
5890
switch ( _d . label ) {
5890
5891
case 0 : return [ 4 /*yield*/ , readdir_enhanced_1 . default . async ( args [ "local-dir" ] , { deep : true , stats : true , sep : "/" , filter : function ( stat ) { return includeExcludeFilter ( stat , args ) ; } } ) ] ;
@@ -6240,7 +6241,7 @@ function getServerFiles(client, logger, args) {
6240
6241
_a . sent ( ) ;
6241
6242
logger . all ( "Clear complete" ) ;
6242
6243
throw new Error ( "nope" ) ;
6243
- case 3 : return [ 4 /*yield*/ , downloadFileList ( client , args [ "state-name" ] ) ] ;
6244
+ case 3 : return [ 4 /*yield*/ , downloadFileList ( client , args [ "server-dir" ] + args [ " state-name"] ) ] ;
6244
6245
case 4 :
6245
6246
serverFiles = _a . sent ( ) ;
6246
6247
logger . all ( "----------------------------------------------------------------" ) ;
@@ -6249,7 +6250,7 @@ function getServerFiles(client, logger, args) {
6249
6250
case 5 :
6250
6251
e_3 = _a . sent ( ) ;
6251
6252
logger . all ( "----------------------------------------------------------------" ) ;
6252
- logger . all ( "No file exists on the server \"" + args [ "state-name" ] + "\" - this much be your first publish! \uD83C\uDF89" ) ;
6253
+ logger . all ( "No file exists on the server \"" + ( args [ "server-dir" ] + args [ " state-name"] ) + "\" - this much be your first publish! \uD83C\uDF89" ) ;
6253
6254
logger . all ( "The first publish will take a while... but once the initial sync is done only differences are published!" ) ;
6254
6255
logger . all ( "If you get this message and its NOT your first publish, something is wrong." ) ;
6255
6256
// set the server state to nothing, because we don't know what the server state is
@@ -6266,6 +6267,16 @@ function getServerFiles(client, logger, args) {
6266
6267
}
6267
6268
function getDefaultSettings ( withoutDefaults ) {
6268
6269
var _a , _b , _c , _d , _e , _f , _g , _h , _j , _k , _l ;
6270
+ if ( withoutDefaults [ "local-dir" ] !== undefined ) {
6271
+ if ( ! withoutDefaults [ "local-dir" ] . endsWith ( "/" ) ) {
6272
+ throw new Error ( "local-dir should be a folder (must end with /)" ) ;
6273
+ }
6274
+ }
6275
+ if ( withoutDefaults [ "server-dir" ] !== undefined ) {
6276
+ if ( ! withoutDefaults [ "server-dir" ] . endsWith ( "/" ) ) {
6277
+ throw new Error ( "server-dir should be a folder (must end with /)" ) ;
6278
+ }
6279
+ }
6269
6280
return {
6270
6281
"server" : withoutDefaults . server ,
6271
6282
"username" : withoutDefaults . username ,
@@ -6362,8 +6373,8 @@ function syncLocalToServer(client, diffs, logger, args) {
6362
6373
return [ 3 /*break*/ , 17 ] ;
6363
6374
case 20 :
6364
6375
logger . all ( "----------------------------------------------------------------" ) ;
6365
- logger . all ( "\uD83C\uDF89 Sync complete. Saving current server state to \"" + args [ "state-name" ] + "\"" ) ;
6366
- return [ 4 /*yield*/ , client . uploadFrom ( args [ "state-name" ] , args [ "state-name" ] ) ] ;
6376
+ logger . all ( "\uD83C\uDF89 Sync complete. Saving current server state to \"" + ( args [ "server-dir" ] + args [ " state-name"] ) + "\"" ) ;
6377
+ return [ 4 /*yield*/ , client . uploadFrom ( args [ "state-name" ] , args [ "server-dir" ] + args [ " state-name"] ) ] ;
6367
6378
case 21 :
6368
6379
_k . sent ( ) ;
6369
6380
return [ 2 /*return*/ ] ;
@@ -6552,7 +6563,7 @@ var ErrorCode;
6552
6563
/***/ } ) ,
6553
6564
6554
6565
/***/ 5739 :
6555
- /***/ ( function ( __unused_webpack_module , exports , __nested_webpack_require_223229__ ) {
6566
+ /***/ ( function ( __unused_webpack_module , exports , __nested_webpack_require_223769__ ) {
6556
6567
6557
6568
"use strict" ;
6558
6569
@@ -6561,7 +6572,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
6561
6572
} ;
6562
6573
Object . defineProperty ( exports , "__esModule" , ( { value : true } ) ) ;
6563
6574
exports . Timer = exports . Timings = exports . pluralize = exports . Logger = void 0 ;
6564
- var pretty_ms_1 = __importDefault ( __nested_webpack_require_223229__ ( 1127 ) ) ;
6575
+ var pretty_ms_1 = __importDefault ( __nested_webpack_require_223769__ ( 1127 ) ) ;
6565
6576
var Logger = /** @class */ ( function ( ) {
6566
6577
function Logger ( level ) {
6567
6578
this . level = level !== null && level !== void 0 ? level : "info" ;
@@ -6731,7 +6742,7 @@ module.exports = __webpack_require__(669);
6731
6742
/******/ var __webpack_module_cache__ = { } ;
6732
6743
/******/
6733
6744
/******/ // The require function
6734
- /******/ function __nested_webpack_require_227574__ ( moduleId ) {
6745
+ /******/ function __nested_webpack_require_228114__ ( moduleId ) {
6735
6746
/******/ // Check if module is in cache
6736
6747
/******/ if ( __webpack_module_cache__ [ moduleId ] ) {
6737
6748
/******/ return __webpack_module_cache__ [ moduleId ] . exports ;
@@ -6746,7 +6757,7 @@ module.exports = __webpack_require__(669);
6746
6757
/******/ // Execute the module function
6747
6758
/******/ var threw = true ;
6748
6759
/******/ try {
6749
- /******/ __webpack_modules__ [ moduleId ] . call ( module . exports , module , module . exports , __nested_webpack_require_227574__ ) ;
6760
+ /******/ __webpack_modules__ [ moduleId ] . call ( module . exports , module , module . exports , __nested_webpack_require_228114__ ) ;
6750
6761
/******/ threw = false ;
6751
6762
/******/ } finally {
6752
6763
/******/ if ( threw ) delete __webpack_module_cache__ [ moduleId ] ;
@@ -6759,11 +6770,11 @@ module.exports = __webpack_require__(669);
6759
6770
/************************************************************************/
6760
6771
/******/ /* webpack/runtime/compat */
6761
6772
/******/
6762
- /******/ __nested_webpack_require_227574__ . ab = __dirname + "/" ; /************************************************************************/
6773
+ /******/ __nested_webpack_require_228114__ . ab = __dirname + "/" ; /************************************************************************/
6763
6774
/******/ // module exports must be returned from runtime so entry inlining is disabled
6764
6775
/******/ // startup
6765
6776
/******/ // Load entry module and return exports
6766
- /******/ return __nested_webpack_require_227574__ ( 6611 ) ;
6777
+ /******/ return __nested_webpack_require_228114__ ( 6611 ) ;
6767
6778
/******/ } ) ( )
6768
6779
;
6769
6780
@@ -6789,7 +6800,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
6789
6800
var __importStar = ( this && this . __importStar ) || function ( mod ) {
6790
6801
if ( mod && mod . __esModule ) return mod ;
6791
6802
var result = { } ;
6792
- if ( mod != null ) for ( var k in mod ) if ( k !== "default" && Object . hasOwnProperty . call ( mod , k ) ) __createBinding ( result , mod , k ) ;
6803
+ if ( mod != null ) for ( var k in mod ) if ( k !== "default" && Object . prototype . hasOwnProperty . call ( mod , k ) ) __createBinding ( result , mod , k ) ;
6793
6804
__setModuleDefault ( result , mod ) ;
6794
6805
return result ;
6795
6806
} ;
0 commit comments