Some updates

diff --git a/agg b/agg
index c542c6315943febe3bf2fd1f30b0c1551e2ebc75..7ce4f68ded4584455d46631225a71761e32cf7f5 100755 (executable)
--- a/agg
+++ b/agg
@@ -19,28 +19,18 @@ image_folder='i/'
 declare -a video_types=('video/mp4' 'video/avi' 'video/fla');
 declare -a image_types=('image/jpg' 'image/jpeg' 'image/png' 'image/gif');
 
-db_schema="CREATE TABLE IF NOT EXISTS entries(id INTEGER PRIMARY KEY AUTOINCREMENT, added DEFAULT CURRENT_TIMESTAMP, link TEXT, title TEXT, desc TEXT, name TEXT, url TEXT, mimetype TEXT)"
-
-if [ ! -f "$DB" ];
-then
-    echo -e "$c_red"No database"$c_end"
-    exit;
-else
-    sqlite3 "$DB" "$db_schema"
-fi
+db_schema="CREATE TABLE IF NOT EXISTS entries(id INTEGER PRIMARY KEY AUTOINCREMENT, added DEFAULT CURRENT_TIMESTAMP, link TEXT, title TEXT, desc TEXT, url TEXT, mimetype TEXT)"
 
 if [ -z $ACTION ]
 then
     exit
 fi
 
-if [ "dl" = $ACTION ]
-then
+if [ "dl" = $ACTION ] ;then
     echo "downloading $FILE"
 #    ~/_code/youtube-dl/youtube-dl -o "%(stitle)s-%(id)s-%(autonumber)s.%(ext)s" $FILE
 fi
-if [[ "ul" = $ACTION && $FILE ]]
-then
+if [[ "ul" = $ACTION && $FILE ]]; then
 
     # get mime type
     mimetype=$(file -b --mime-type $FILE)
@@ -54,20 +44,32 @@ then
         exit
     fi
 
+    # prepare database
+    # if [ ! -f "$DB" ]; then
+    #     echo -e "$c_red"No database"$c_end"
+    # else
+    sqlite3 "$DB" "$db_schema"
+    # fi
+
     # get user input for data
-    echo -ne $c_yellow"link\t"$c_end; read -r LINK; printf -v LINK "%q" "$LINK"
-    echo -ne $c_yellow"title\t"$c_end; read -r TITLE; printf -v TITLE "%q" "$TITLE"
-    echo -ne $c_yellow"desc\t"$c_end; read -r DESC; printf -v DESC "%q" "$DESC"
+    echo -ne $c_yellow"link\t"$c_end; read -r LINK
+    echo -ne $c_yellow"title\t"$c_end; read -r TITLE
+    echo -ne $c_yellow"desc\t"$c_end; read -r DESC
+    #printf -v DESC "%q" "$DESC"
     URL="$S3_URL$FOLDER$FILE"
-    sqlite3 "$DB" "INSERT INTO entries (link, title, desc, url, name, mimetype) VALUES ('$LINK','$TITLE','$DESC', '$URL', '$FILENAME', '$mimetype')";
+    sqlite3 "$DB" "INSERT INTO entries (link, title, desc, url, mimetype) VALUES ('$LINK','$TITLE','$DESC', '$URL', '$mimetype')";
 
     # upload file to s3
     echo -e $c_green"Uploading to s3..."$c_end
     # get filename
     FILENAME=$(basename $FILE)
     # put file on s3
-    s3cmd put --acl-public --guess-mime-type "$FILE" "$S3_BUCKET$FOLDER$FILENAME"
+    s3cmd put -v --acl-public --guess-mime-type "$FILE" "$S3_BUCKET$FOLDER$FILENAME"
 
 fi
-
-
+if [ "pull-data" = $ACTION ]; then
+    s3cmd get -v "$S3_BUCKET$DB"
+fi
+if [ "push-data" = $ACTION ]; then
+    s3cmd put -v --guess-mime-type "$DB" "$S3_BUCKET$DB"
+fi

diff --git a/agg.sh b/agg.sh
deleted file mode 100755 (executable)
index 9d9d661..0000000
--- a/agg.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-ACTION=$1
-VID=$2
-TIMESTAMP=$(date +%s)
-S3_BUCKET="s3://agg/"
-
-if [ -z "$ACTION" ]
-then
-    echo "Action is not defined."
-    exit
-fi
-if [ -z "$VID" ]
-then
-    echo "Video is not defined."
-    exit
-fi
-
-if [ "dl" = "$ACTION" ]
-then
-    echo "downloading $VID" 
-#    ~/_code/youtube-dl/youtube-dl -o "%(stitle)s-%(id)s-%(autonumber)s.%(ext)s" $VID
-fi
-if [ "ul" = "$ACTION" ]
-then
-    echo "uploading to: $S3_BUCKET"v/"$VID"
-    s3cmd put "$VID" "$S3_BUCKET"v/"$VID"
-
-    ## append data
-    DATA="https://s3.amazonaws.com/agg/v/$VID"
-
-    read -r -p "Origin: " URL
-    DATA="$DATA | $URL"
-
-    read -r -p "Title: " TITLE
-    DATA="$DATA | $TITLE"
-
-    read -r -p "Description: " DESC
-    DATA="$DATA | $DESC"
-
-    ## download datafile
-    echo "downloading datafile"
-    s3cmd get "$S3_BUCKET"data.json --force
-
-    echo "appending new entry"
-    echo "$DATA" >> "data.json"
-
-    
-    
-    echo "uploading new datafile"
-    s3cmd put data.json "$S3_BUCKET"data.json
-
-fi
-
-

diff --git a/data.json b/data.json
deleted file mode 100644 (file)
index d475e96..0000000
--- a/data.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "entries": [
-        {
-            "added": 1363583266,
-            "desc": "",
-            "filename": "yeah-lamb.mp4",
-            "link": "",
-            "title": "yeah lamb",
-            "url": "http://agg.s3.amazonaws.com/v/yeah-lamb.mp4"
-        },
-        {
-            "added": 1363583344,
-            "desc": "",
-            "filename": "BmpMPZCgSvs.mp4",
-            "link": "",
-            "title": "cymatics",
-            "url": "http://agg.s3.amazonaws.com/v/BmpMPZCgSvs.mp4"
-        }
-    ]