New CLI linux style command list #416

aligeti · 2018-01-31T20:22:19Z

Adding new commands to CLI supporting linux style

…name to be entered as part of the existing command. The command "storj list-buckets [bucket-name]" is used to list the bucket ID of corresponding bucket name, if found in the buckets list. Example: If no bucket name specified, then the command lists all available buckets ./storj list-buckets ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2017-12-15T17:23:25.832Z Name: testbucket ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 ID: b20824d412f7a8845379769e Decrypted: true Created: 2017-12-18T18:15:05.270Z Name: testbucket4 Example: If bucket name is specified, then the command lists details specific to the entered bucket name ./storj list-buckets testbucket ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2017-12-15T17:23:25.832Z Name: testbucket Example: If bucket name is specified, but doesnt exists, then the command return error ./storj list-buckets testbucketXYZ Invalid bucket name.

…et_name]

Test Case storj-archived#1: No bucket name given kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files Missing first argument: <bucket-id> Test Case storj-archived#2: Complete command with valid bucket name with 2 files in it kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files testbucket ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2017-12-15T17:23:25.832Z Name: testbucket ID: 27607c99600540cc4c57953c Size: 9 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-15T17:27:25.461Z Name: testfile.txt ID: ee2fcc89dfe71c932cf44fcc Size: 10 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-15T17:29:38.994Z Name: testfile2.txt Test Case storj-archived#3: Complete command with valid bucket name but no files in it kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files testbucket2 ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 No files for bucket. Test Case storj-archived#4: Compete command with invalid bucket name kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files testbucket2233432 Invalid bucket name.

Checking in supports "storj list-files [bucket_name]" Test Case storj-archived#1: No bucket name given kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files Missing first argument: <bucket-id> Test Case storj-archived#2: Complete command with valid bucket name with 2 files in it kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files testbucket ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2017-12-15T17:23:25.832Z Name: testbucket ID: 27607c99600540cc4c57953c Size: 9 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-15T17:27:25.461Z Name: testfile.txt ID: ee2fcc89dfe71c932cf44fcc Size: 10 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-15T17:29:38.994Z Name: testfile2.txt Test Case storj-archived#3: Complete command with valid bucket name but no files in it kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files testbucket2 ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 No files for bucket. Test Case storj-archived#4: Compete command with invalid bucket name kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj -d list-files testbucket2233432 Invalid bucket name. on branches master branches master

========================================================================================================== Testcase storj-archived#1: No aruguments entered kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file Missing arguments: <bucket-name> <path> ======================================================================================================== LIST ALLTHE VALID BUCKETS NAMES kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj list-buckets ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2017-12-15T17:23:25.832Z Name: testbucket ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 ID: b20824d412f7a8845379769e Decrypted: true Created: 2017-12-18T18:15:05.270Z Name: testbucket4 ========================================================================================================= PICK A BUCKET AND LIST ALL THE FILES IN THAT BUCKET kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj list-files testbucket2 ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 ID: 4022eed501eb8d008ce61b84 Size: 22 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-21T23:39:17.352Z Name: testfileA.txt ========================================================================================================== TEST CASE#2: Execute the complete upload-file command kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file testbucket2 testjson.json ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 [======================================================================] 100.00% Upload Success! File ID: 037431e2b0489b41db7a363d ========================================================================================================== LIST THE FILES IN THE ABOVE UPLOADED BUCKET TO VERIFY THAT THE NEW FILES IS LISTED AS WELL kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj list-files testbucket2 ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 ID: 4022eed501eb8d008ce61b84 Size: 22 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-21T23:39:17.352Z Name: testfileA.txt ID: 037431e2b0489b41db7a363d Size: 1448 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-22T13:56:16.628Z Name: testjson.json ========================================================================================================== TEST CASE#3: VALID BUCKET NAME AND INVALID FILE-NAME kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file testbucket2 testjson.jsondsf ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 Invalid file path: testjson.jsondsf ========================================================================================================== TEST CASE#4: INVALID BUCKET NAME AND INVALID FILE-NAME kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file testbucket2sfs testjson.jsondsf Invalid bucket name. ========================================================================================================== TEST CASE#4: INVALID BUCKET NAME AND VALID FILE-NAME kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file testbucket3sfs testjson.json Invalid bucket name. ========================================================================================================== TEST CASE#5: VALID BUCKET NAME AND VALID FILE-NAME kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file testbucket3 testjson.json ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 [======================================================================] 100.00% Upload Success! File ID: f10d046334eea2e7a6ba9723 ========================================================================================================== TEST CASE#6: TRY AGAIN TO UPLOAD THE SAME FILE WITH VALID BUCKET NAME AND VALID FILE-NAME kishore@kishore-Inspiron-13-7353:~/libstorj/src$ ./storj upload-file testbucket3 testjson.json ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 Preparing File... Upload failure: File already exists ==========================================================================================================

…d-file cli command using symbolic name

…name> storj://<bucketname>/[filename][.][]

…>/<filename> --> ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/* --> Invalid target filename --> ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/. --> uploads correctly --> ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/teset2 --> Invalid target filename --> ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/teset1 --> uploads correctly

Modified the file_exists() to verify the local filename entered is either a directory or a file. Also if it is a directory will print out all the files recursively( from sub directories)

…vely. Commented the printf statements. Uncommenting them, you can see on the stdio

Added the functionality to test ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/teset1 ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/. ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/ ./storj cp -r[R] /home/kishore/libstorj/src/teset1 storj://testbucket/teset1 ./storj cp -r[R] /home/kishore/libstorj/src/teset1 storj://testbucket/. ./storj cp -r[R] /home/kishore/libstorj/src/teset1 storj://testbucket/ Working on uploading the file recursively.

Working on recursive uploads Current implementation ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/teset1 ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/. ./storj cp /home/kishore/libstorj/src/teset1 storj://testbucket/ ./storj cp -r[R] /home/kishore/libstorj/src/teset1 storj://testbucket/teset1 ./storj cp -r[R] /home/kishore/libstorj/src/teset1 storj://testbucket/. ./storj cp -r[R] /home/kishore/libstorj/src/teset1 storj://testbucket/

…one file is currently uploadable

./storj cp -r /home/kishore/libstorj/src/ storj://testbucket/

…le command using storj cp [-rR]storj://<bucket-name>/<file-name> <local_download_path>

…works too

Supported CLI commands ./storj get-bucket-id <bucket-name> Example: ./storj get-bucket-id testbucket ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket ./storj upload-file <bucket-name> <path-to-local-file-name> Example: ./storj upload-file testbucket3 uploader.lo ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 [======================================================================] 100.00% Upload Success! File ID: b8c4543226e9c65f61aa0141 ./storj download-file <bucket-name> <file-name> <path-to-local-file-name> Example: Local file name not given ./storj download-file testbucket3 uploader.o /tmp/. ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 stat: No such file or directory Warning: File already exists at path [/tmp/.]. Would you like to overwrite [/tmp/.]: [y/n] y Unable to open /tmp/.: Is a directory Example: Local file name given ./storj download-file testbucket3 uploader.o /tmp/uploader.ks ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 [======================================================================] 100.00% Download Success! Example: Downloading with a filename that already exists locally ./storj download-file testbucket3 uploader.o /tmp/uploader.ks ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 Warning: File already exists at path [/tmp/uploader.ks]. Would you like to overwrite [/tmp/uploader.ks]: [y/n] y [======================================================================] 100.00% Download Success! ./storj list-files <testbucket-name> Example: List files in a bucket using bucket name ./storj list-files testbucket3 ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 ID: f10d046334eea2e7a6ba9723 Size: 1448 bytes Decrypted: true Type: application/octet-stream Created: 2017-12-22T13:57:52.415Z Name: testjson.json ID: 0f58c36885553516ccb63141 Size: 9200 bytes Decrypted: true Type: application/octet-stream Created: 2018-01-09T16:53:18.496Z Name: teset1 ID: 190dc667ba33a72b00e3dbb7 Size: 16528 bytes Decrypted: true Type: application/octet-stream Created: 2018-01-09T17:30:28.090Z Name: rs.o ID: f25ae0dde4fb7b3559e8f089 Size: 94808 bytes Decrypted: true Type: application/octet-stream Created: 2018-01-09T17:31:03.138Z Name: uploader.o ID: b8c4543226e9c65f61aa0141 Size: 279 bytes Decrypted: true Type: application/octet-stream Created: 2018-01-09T17:32:02.076Z Name: uploader.lo ./storj cp <path-to-local-filename> storj://<bucket-name>/<target-file-name> ./storj cp <path-to-local-filename> storj://<bucket-name>/. ./storj cp <path-to-local-filename> storj://<bucket-name>/<blank> Example: uploading a file using ‘cp’ command. The target file name should be same as the upload file name, or ‘.’ or blank(no target file name) Example: Using uploaded file name same as uploading same file ./storj cp /tmp/uploader.ksa storj://testbucket/uploader.ksa ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket [======================================================================] 100.00% Upload Success! File ID: 3092473ebc48a2d469a4a59d Example: Using uploaded file name same as uploading same file, trying to upload a file already uploaded ./storj cp uploader.o storj://testbucket3/uploader.o ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 Preparing File... Upload failure: File already exists Example: Uploading a file to a different bucket ./storj cp uploader.o storj://testbucket2/uploader.o ID: 725131c74690150e7b0cc747 Decrypted: true Created: 2017-12-18T16:41:41.583Z Name: testbucket2 [======================================================================] 100.00% Upload Success! File ID: 6b82f6030fc688336190d768 Example: Using uploaded file name is entered as ‘.’ ./storj cp http.o storj://testbucket3/. ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 [======================================================================] 100.00% Upload Success! File ID: 65ac6ea61a175d06bcfa7567 Example: Missing uploaded file name (no file name entered or is blank) ./storj cp rs.lo storj://testbucket3/ [2212] target file name = rs.lo ID: 965efd4b5d65fd82643f5727 Decrypted: true Created: 2017-12-18T18:14:05.098Z Name: testbucket3 [======================================================================] 100.00% Upload Success! File ID: fcd43a40f4543366d09ddb5c ./storj cp storj://<bucket-name>/<target-file-name> <path-to-local-filename> Example: Downloaded file (teset1) same as the downloading file(teset1) ./storj cp storj://testbucket/teset1 /tmp/teset1 ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket [======================================================================] 100.00% Download Success! Example: Downloaded file(teset2) different from downloading file(teset1) ./storj cp storj://testbucket/teset1 /tmp/teset2 ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket [======================================================================] 100.00% Download Success! Example: Downloading same as above. The command prompts to overwrite? ./storj cp storj://testbucket/teset1 /tmp/teset2 ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket Warning: File already exists at path [/tmp/teset2]. Would you like to overwrite [/tmp/teset2]: [y/n] y [======================================================================] 100.00% Download Success! Example: Downloaded file name not given ./storj cp storj://testbucket/teset1 /tmp/ ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket Warning: File already exists at path [/tmp/]. Would you like to overwrite [/tmp/]: [y/n] y Unable to open /tmp/: Is a directory Example: Downloaded file name is ‘.’ ./storj cp storj://testbucket/teset1 /tmp/. ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket Warning: File already exists at path [/tmp/.]. Would you like to overwrite [/tmp/.]: [y/n] y Unable to open /tmp/.: Is a directory Example: Downloaded file name is ‘*’-- DONT USE THIS COMMAND. It will overwrite the first file in the directory and renames it to the downloading file name. ./storj cp storj://testbucket/http.o /tmp/* ID: 6cb2014a988adca6ed712577 Decrypted: true Created: 2018-01-04T16:55:29.832Z Name: testbucket Warning: File already exists at path [/tmp/Aac.o]. Would you like to overwrite [/tmp/Aac.o]: [y/n] y [======================================================================] 100.00% Download Success!

This reverts commit f0cfe08ba703d5f5563d20e34801e3c34cdfe120.

…d same file twice

aleitner · 2018-02-07T17:56:49Z

src/cli.c

+    int ret = strpos(cmd_str, sub_str);
+    if( ret == -1)
+    {
+        printf("Invalid Command Entry (%d), \ntry ... stroj://<bucket_name>/<file_name>\n", ret);


typo should be storj not stroj

fixed the typo

aleitner · 2018-02-07T18:10:46Z

3 things need to be fixed before merging

Remove-file, and list-mirrors prints all the files in a bucket
Can't do anything by file id anymore
Fix typo where stroj was typed instead of storj

braydonf · 2018-02-07T18:55:53Z

I would leave the existing commands, such as list-files,
list-buckets, upload-file and download-file as-is and add a new
section for the unix fs style of commands with different argument
formats, example:

usage: storj [<options>] <command> [<args>]

These are common Storj commands for various situations:

setting up users profiles
  register                  setup a new storj bridge user
  import-keys               import existing user
  export-keys               export bridge user, password and encryption keys

unix style commands
  ls (lists the available buckets)
  ls <bucket-name> (lists the files in a bucket)
  rm <bucket-name> (remove bucket)
  rm <bucket-name> <file-name> (to remove file in a bucket)
  cp [-rR] <path-to-local-file-name> storj://<bucketname>/file-name
  mkbkt <bucket-name> (make a bucket)

working with buckets and files
  list-buckets
  list-files <bucket-id>
  remove-file <bucket-id> <file-id>
  add-bucket <name> 
  remove-bucket <bucket-id>
  list-mirrors <bucket-id> <file-id>

downloading and uploading files
  upload-file <bucket-id> <path>
  download-file <bucket-id> <file-id> <path

bridge api information
  get-info

...

braydonf · 2018-02-07T20:23:56Z

src/storj.c

+    storj_api->excp_cmd_resp = "get-bucket-id-resp";
+
+    /* when callback returns, we store the bucket id of bucket name else null */
+    return storj_bridge_get_buckets(storj_api->env, storj_api, get_bucket_id_callback);


This can be storj_bridge_get_bucket_id, which was recently added.

It just happened to be a coincidence, I am open for renaming the function. For the time being I will leave there.

It's an already existing function, see https://github.com/Storj/libstorj/blob/master/src/storj.c#L1451

changed the function name to cli-get-bucket_id()

braydonf · 2018-02-07T20:29:59Z

src/cli.c

+{
+    struct stat sb;
+
+    if (stat(file_path, &sb) == -1)


Currently the style for brackets is on the same line for everything except functions, e.g.:

if (stat(file_path, &sb) == -1) {

fixed the braces indentation as per the suggestion

Still looks like these are unchanged (bracket styles).

braydonf · 2018-02-07T20:35:19Z

src/Makefile.am

@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libstorj.la
-libstorj_la_SOURCES = storj.c utils.c utils.h http.c http.h uploader.c uploader.h downloader.c downloader.h bip39.c bip39.h bip39_english.h crypto.c crypto.h rs.c rs.h
+libstorj_la_SOURCES = storj.c utils.c utils.h http.c http.h uploader.c uploader.h downloader.c downloader.h bip39.c bip39.h bip39_english.h crypto.c crypto.h rs.c rs.h storjapi_callback.c storjapi_callback.h


Instead of storjapi_callback.c and storjapi_callback.h it could be more clear as cli_callback.c and cli_callback.h?

Changed the file names from Storjapi_callback.h/c to cli_callback.h/c

braydonf · 2018-02-07T20:36:37Z

Adding storj_list_buckets (and the others) to the exposed API in storj.h with already existing
storj_bridge_list_buckets will be confusing. We can encapsulate those methods to be specific to the CLI rather than exposed in storj.h?

braydonf · 2018-02-07T20:46:06Z

src/cli.c

+
+        storj_api->env = env;
+
+        #ifdef debug_enable


There is a logger that can be used that will enable/disable debug based on settings (e.g. using --debug), example usage:

state->log->debug(env->log_options, NULL /*handle pointer*/, "Some debug message: %i", some_integer);

currently printf's that I left in the code is used to printout error conditions. Will look into adding log->debug usage

braydonf · 2018-02-07T20:53:30Z

src/storjapi_callback.h

+
+#include "storj.h"
+
+#define CLI_NO_SUCH_FILE_OR_DIR   0x00


These are defined twice? Once here and another in cli.c.

Removed the duplication.

…nd file-id along with new commands that takes bucket-name and file-name

bryanchriswhite · 2018-02-10T22:17:05Z

@braydonf it seems like it would be beneficial to expose the functions that take bucket/file names as well as those that take IDs; e.g. binding libraries would have to re-implement the name decryption/lookup if the new methods aren't exposed.

I could imagine the solution either being to rename things to be less ambiguous or to move the new functionality to a helper module or something (i.e. not in cli.c) that can also be referenced by libstorj api consumers.

…torj api call from storj.c instead of reading bucket list and doing a string compare; 3. moved the cli_api_t structure to cli_callback.h and renamed the structure to cli_api_t

braydonf · 2018-02-12T17:15:12Z

@bryanchriswhite Yes, those methods have been exposed already as storj_bridge_get_bucket_id and storj_bridge_get_file_id from #414 and included in v2.0.0-beta2

braydonf · 2018-02-12T17:50:06Z

src/uploader.c

@@ -370,7 +370,7 @@ static void after_create_bucket_entry(uv_work_t *work, int status)
        state->info->id = NULL;
        state->info->bucket_id = state->bucket_id;
        state->info->decrypted = true;
-        state->info->index = strdup(state->index);
+        state->info->index = state->index;


This may have been a regression, state->info->index = strdup(state->index); is how this should be (and should go along with leaving the free to file->index in storj_free_uploaded_file_info.

made changes per the comment

braydonf · 2018-02-12T17:50:44Z

src/cli_callback.h

+
+#include "storj.h"
+
+#if defined(_WIN32) && defined(STORJDLL)


This DLL export stuff isn't needed here.

removed the CLI_API references

braydonf · 2018-02-12T17:51:31Z

src/cli_callback.c

+}
+
+
+CLI_API int cli_list_buckets(cli_api_t *cli_api)


These CLI_API are not needed here, only relevant for DLL exporting.

braydonf · 2018-02-12T17:54:26Z

src/cli.c

+{
+    struct stat sb;
+
+    if (stat(file_path, &sb) == -1)


Still looks like these are unchanged (bracket styles).

braydonf · 2018-02-12T17:55:55Z

src/cli.c

    "  upload-file <bucket-id> <path>\n"                                \
-    "  download-file <bucket-id> <file-id> <path>\n"                    \
+    "  cp [-rR] <path-to-local-file-name> "                             \


Grouping the unix style commands in the help text I think would be useful (example from comment at #416 (comment))

fixed the parenthesis and grouped the linux style commands

…j api functions

…grouped the linux style commands, updated the uploader file( not sure why it didnt merge when I did the fetch from upstream), but anyhow merged the changes explicitly

braydonf

Looks like most issue have been addressed! Found a couple of smaller formatting issues (easy fixes).

braydonf · 2018-02-14T22:21:14Z

src/cli.c

+        printf("command = %s; command_index = %d\n", command, command_index);
+        printf("local_file_path (req arg_ = %s\n", local_file_path);
+        for (int i = 0x00; i < argc; i++)
+        {


Another { on newline, instead of same line

braydonf · 2018-02-14T22:23:00Z

src/cli.c

+            char sub_str[] = "storj://";
+            ret = strpos(dst_path, sub_str);
+
+            if( ret == 0x00) { /* Handle upload command*/


Small spacing issue: should be if ( instead of if(

braydonf · 2018-02-14T22:24:04Z

src/cli.c

+
+                cmd_type = UPLOAD_CMD;
+            }
+            else if (ret == -1) { /* Handle download command*/


nit: newline, instead of same line

braydonf · 2018-02-14T22:24:57Z

src/cli.c

+                                /* set the file to be downloaded */
+                                cli_api->file_name = token[2];
+
+                                if ((check_file_path(local_file_path) == CLI_VALID_DIR) || (strcmp(dst_file_name, ".") == 0x00)) {


potential max line length issues here?

braydonf · 2018-02-14T22:25:46Z

src/cli.c

+                        printf("[%s][%d] Valid dst filename missing !!!!!\n", __FUNCTION__, __LINE__);
+                        goto end_program;
+                    }
+                } 


nit: } else { instead of the newline

braydonf · 2018-02-14T22:29:11Z

src/cli.c

+
+            cli_list_mirrors(cli_api);
+        } else
+        {


nit: newline

braydonf · 2018-02-14T22:29:39Z

src/cli.c

@@ -1485,5 +1582,9 @@ int main(int argc, char **argv)
    if (mnemonic) {
        free(mnemonic);
    }
+    if(cli_api){


nit: spacing, instead if (cli_api) {

braydonf · 2018-02-14T22:30:06Z

src/cli_callback.c

@@ -0,0 +1,1168 @@
+#include "cli_callback.h"
+
+//#define debug_enable


nit: extraneous variable

braydonf · 2018-02-14T22:30:25Z

src/cli_callback.c

+    char * start;
+    cli_api_t *cli_api = handle;
+
+    if((dp = opendir(dir)) == NULL) {


nit: spacing

braydonf · 2018-02-14T22:30:51Z

src/cli_callback.c

+    }
+
+    switch (sb.st_mode & S_IFMT)
+    {


nit: newline

braydonf · 2018-02-14T22:36:15Z

@aligeti Also, please don't forget to take the WIP off the title when you're ready to merge.

braydonf · 2018-02-14T23:40:11Z

Went ahead and made some of the above changes already, and included in: #422

aligeti · 2018-02-14T23:40:21Z

Thanks will take care of the indentation. Getting used to the development process. Thanks for the info on the download pause and resume feature.

…

Sent from my iPhone

On Feb 14, 2018, at 17:36, Braydon Fuller ***@***.***> wrote: @aligeti Also, please don't forget to take the WIP off the title when you're ready to merge. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

braydonf · 2018-02-14T23:47:59Z

Cool, it's merged so we can get more testing.

FYI you can include Closes #354 in the description on the PR and it will automatically close the issue once merged.

aligeti added 30 commits December 19, 2017 11:19

Added internal command "get-bucket-id", similar to list-buckets [buck…

dea86f4

…et_name]

list-files <bucket_name> with debug checkin

6cbd196

Indentation Changes & Implemented list-files, upload-file and downloa…

055323a

…d-file cli command using symbolic name

Initial implementation of upload-file alias cp using ./storj cp <file…

802b30f

…name> storj://<bucketname>/[filename][.][]

Incremental checking

4e1c7f5

Modified the file_exists() to verify the local filename entered is either a directory or a file. Also if it is a directory will print out all the files recursively( from sub directories)

Modified printdir() to printout all the files with absolutely recursi…

76244d2

…vely. Commented the printf statements. Uncommenting them, you can see on the stdio

Cleaned the code. Removed the commented code out

0d0c286

Reading from a file the list of files to be uploaded is coded. Only …

6c2cdfd

…one file is currently uploadable

fixed the broken list-files command

e2cde59

uploading a list of files partially working

25fa8b4

Recursive uploading functionality

f2487a4

./storj cp -r /home/kishore/libstorj/src/ storj://testbucket/

development tested recursive cp (upload) functionality

0c8d134

SUPPORT OF RECURSIVE UPLOADING CLI COMMAND

84919af

Refactored the upload-file code and added the support for download-fi…

ffe7ab1

…le command using storj cp [-rR]storj://<bucket-name>/<file-name> <local_download_path>

new dowload-file command supported

25baaa0

support of downloading files using cp with debug info

48589da

support of single file and all files download and list-files command …

31fba52

…works too

Cleaned up the 'get-bucket-id' command

a4b63d6

Revert "Added unity"

da4c0b8

This reverts commit f0cfe08ba703d5f5563d20e34801e3c34cdfe120.

added storjapi callback function calls

8a22b65

added storjapi callback function calls

0f90173

added list-files, remove-buket storj api calls

1b54961

aligeti added 4 commits February 5, 2018 11:23

fixes warnings and clean up of unused code in cli.c

51b3b63

Change merges from main libstorj

173b5da

fixes the single file upload without the -r option causes it to uploa…

833cb41

…d same file twice

Resolved merge conflict

b8d7df1

aleitner reviewed Feb 7, 2018

View reviewed changes

braydonf reviewed Feb 7, 2018

View reviewed changes

aligeti added 4 commits February 8, 2018 11:39

Has changes to support the original cli commands based of bucket-id a…

ff0bfd2

…nd file-id along with new commands that takes bucket-name and file-name

renamed the file from storjapi_callback.c/h to cli_callback.c/h

d511a38

Has changes per the review comments

cc9c1de

`Merge remote-tracking branch 'upstream/master'

d5eefde

1. moved the cli api files to callback.c; 2. Used the get bucket id s…

7654a8f

…torj api call from storj.c instead of reading bucket list and doing a string compare; 3. moved the cli_api_t structure to cli_callback.h and renamed the structure to cli_api_t

braydonf reviewed Feb 12, 2018

View reviewed changes

aligeti added 2 commits February 12, 2018 12:58

modified the state machine to used get bucket id and get file id stor…

37e5478

…j api functions

updated with review comments: removed cli_api ref, fixed the braces, …

42336cb

…grouped the linux style commands, updated the uploader file( not sure why it didnt merge when I did the fetch from upstream), but anyhow merged the changes explicitly

braydonf reviewed Feb 14, 2018

View reviewed changes

braydonf changed the title ~~WIP: New CLI linux style command list~~ New CLI linux style command list Feb 14, 2018

braydonf merged commit 42336cb into storj-archived:master Feb 14, 2018

braydonf mentioned this pull request Feb 14, 2018

File copying interface, wildcards and name reference #354

Closed

3 tasks

		@@ -0,0 +1,1168 @@
		#include "cli_callback.h"

		//#define debug_enable

New CLI linux style command list #416

New CLI linux style command list #416

Conversation

aligeti commented Jan 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aleitner commented Feb 7, 2018

braydonf commented Feb 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

braydonf Feb 12, 2018 • edited Loading

Choose a reason for hiding this comment

braydonf Feb 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

braydonf commented Feb 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

braydonf Feb 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bryanchriswhite commented Feb 10, 2018

braydonf commented Feb 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

braydonf Feb 12, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

braydonf left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

braydonf commented Feb 14, 2018

braydonf commented Feb 14, 2018

aligeti commented Feb 14, 2018 via email

braydonf commented Feb 14, 2018

braydonf commented Feb 7, 2018 •

edited

Loading

braydonf Feb 12, 2018 •

edited

Loading

braydonf Feb 7, 2018 •

edited

Loading

braydonf commented Feb 7, 2018 •

edited

Loading

braydonf Feb 7, 2018 •

edited

Loading

braydonf Feb 12, 2018 •

edited

Loading