some cleanup.

diff --git a/README b/README
index 0903b0851cdffe0b21d7a75dc406469111b9c5d6..ff2a289a29a937f3b3b143d7f1860a6efd972cc4 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,4 @@
 ## requirements
-Amazon s3 account       http://aws.amazon.com/
+Amazon S3 Account       http://aws.amazon.com/
 s3cmd                   http://s3tools.org/s3cmd
+youtube-dl              http://rg3.github.com/youtube-dl/

diff --git a/agg b/agg
index a54233db1c3e26c8ee950d529cf0334c396f734d..59f1c8a7f712cb0bc32ac77886a3151881ad2454 100755 (executable)
--- a/agg
+++ b/agg
@@ -2,9 +2,9 @@
 
 USAGE="Usage: agg COMMAND [parameters]
 
-agg is a script for downloading media files and
-uploading them to an S3 bucket. The scripts stores
-metadata in a sqlite3 database.
+agg is a script for uploading media files to
+an S3 bucket. The scripts stores metadata in a
+sqlite3 database.
 
 Commands:
   Upload media file
@@ -12,9 +12,9 @@ Commands:
   Download media from external Site with youtube-dl
     agg dl http://www.youtube.com/watch?v=ZUdHX1Bent0
   Download database to Local
-    agg pull-data
+    agg pull
   Upload database to S3
-    agg push-data
+    agg push
   Publish on remote website
     agg publish
   List folder on S3
@@ -45,7 +45,12 @@ mimetype TEXT)"
 
 video_folder='v/'
 image_folder='i/'
-declare -a video_types=('video/mp4' 'video/avi' 'video/fla');
+declare -a video_types=(
+'video/mp4'
+'video/avi'
+'video/fla'
+'application/octet-stream'
+);
 declare -a image_types=('image/jpg' 'image/jpeg' 'image/png' 'image/gif');
 
 if [ -z $COMMAND ]; then
@@ -83,13 +88,10 @@ elif [[ "ul" = $COMMAND && $2 ]]; then
     s3cmd put -v --acl-public --guess-mime-type "$FILE" "$S3_BUCKET$FOLDER$FILENAME"
 elif [ "ls" = $COMMAND ]; then
     s3cmd ls $S3_BUCKET$2/
-elif [ "pull-data" = $COMMAND ]; then
+elif [ "pull" = $COMMAND ]; then
     s3cmd get -v "$S3_BUCKET$DB"
-elif [ "push-data" = $COMMAND ]; then
+elif [ "push" = $COMMAND ]; then
     s3cmd put -v --acl-public "$DB" "$S3_BUCKET$DB"
 elif [ "publish" = $COMMAND ]; then
     ssh quilime@quilime.com "cd ~/media.quilime.com/vid/; curl -O http://agg.s3.amazonaws.com/agg.db"
-elif [[ "dl" = $COMMAND && 2 ]]; then
-    echo "downloading $2"
-    ~/_code/youtube-dl/youtube-dl -o "%(stitle)s-%(id)s-%(autonumber)s.%(ext)s" $2
 fi