huge refactor, might breaking things

1 files changed, 43 insertions, 27 deletions

diff --git a/bin/ak-mixtapes b/bin/ak-mixtapes
index 6b70bf5..712bb54 100755
--- a/bin/ak-mixtapes
+++ b/bin/ak-mixtapes
@@ -1,21 +1,24 @@
 #!/bin/bash
-# The following creates a mixtape data message
-# We can extend it by calling the ak-zblock-pack.sh mixtape/add data ## ORIGINAL LINE
+##
+## The following creates a mixtape data message
+##
+## Usage:
+##
+##  -a <artist> <title> <file>            Adds a file with tags artist and title
+##
+##  -h , --help
+##
+##  -s , --specs
+##
+# We can extend it by calling the _ak_zblock_pack.sh mixtape/add data ## ORIGINAL LINE
+fullprogrampath="$(realpath $0)"
 PROGRAM="$(basename $0)"
 descriptionString="AK mixtape block creator"
-source $AK_LIBDIR/_ak_logit
-source $AK_LIBDIR/_ak_script_description
+source $AK_LIBDIR/_ak_log
+source $AK_LIBDIR/_ak_script
 source $AK_LIBDIR/_ak_ipfs
 source $AK_LIBDIR/_ak_gpg
-
-_ak_modules_mixtapes_usage(){
-	_ak_modules_mixtapes_title
-	echo "Usage: $0 - artist title file"
-}
-
-_ak_modules_mixtapes_title(){
-    description
-}
+source $AK_LIBDIR/_ak_zblock
 
 _ak_modules_mixtapes_specs(){
     datetime_mask=$(printf '^[0-9]\{8\}_[0-9]\{6\}$' | xxd -p)
@@ -31,6 +34,20 @@ _ak_modules_mixtapes_specs(){
         }' | jq
 }
 
+_ak_modules_mixtapes_add(){
+    if [ ! -z $3 ];
+    then
+        echo $1
+        PWD="$(pwd)"
+        MIXTAPE_ARTIST="$1"
+        MIXTAPE_TITLE="$2"
+        MIXTAPE_FILE="$PWD/$3"
+        _ak_modules_mixtapes_main $1
+        cat $PWD/data | jq -M
+        _ak_zblock_pack mixtape/add $PWD/data
+    fi
+}
+
 _ak_modules_mixtapes_main(){
     echo $MIXTAPE_FILE "by" $MIXTAPE_ARTIST "named as" $MIXTAPE_TITLE
 
@@ -53,18 +70,17 @@ EOF
 
 }
 
-if [ ! -z $3 ];
-then
-    PWD="$(pwd)"
-    MIXTAPE_ARTIST="$1"
-    MIXTAPE_TITLE="$2"
-    MIXTAPE_FILE="$PWD/$3"
-    _ak_modules_mixtapes_main
-    cat $PWD/data | jq -M
-    ak-zblock-pack mixtape/add $PWD/data
-elif [ "$1" == "specs" ]
-then
-    _ak_modules_mixtapes_specs
-    exit 0
-else _ak_modules_mixtapes_usage
+if [ ! -z $1 ]; then
+    case $1 in
+        -h | --help) _ak_usage; exit;;
+        -l | --local-index) _ak_modules_mixtapes_index; exit;;
+        -i | --import) _ak_modules_mixtapes_import $2; exit;;
+        -a | --add) _ak_modules_mixtapes_add_from_file $2 $3 $4; exit;;
+        -c | --create) _ak_modules_mixtapes_create; exit;;
+        -r | --read) _ak_modules_mixtapes_read $2; exit;;
+        -s | --specs) _ak_modules_mixtapes_specs $2; exit;;
+        -x | --html) _ak_modules_mixtapes_html $2; exit;;
+        * ) _ak_usage;;
+    esac
+else _ak_usage
 fi