updated some python

diff --git a/agg.py b/agg.py
index 99003aba5d2b7cd4a7db4d8fc1be00cd9f2f2c72..1f33392a3fb4640293a8c51e23e347c04bbaf448 100755 (executable)
--- a/agg.py
+++ b/agg.py
@@ -14,18 +14,27 @@ s3_url="http://agg.s3.amazonaws.com/"
 
 def main():
 
-    if len(sys.argv) <= 2:
-        print """must have 2 arguments"""
+    if len(sys.argv) < 2:
         exit()
+    if len(sys.argv) == 3:
+        media_path = sys.argv[2]
+        media_filename = os.path.split(sys.argv[2])[-1]
 
     action = sys.argv[1]
-    #media_path_obj = 
-    media_filename = os.path.split(sys.argv[2])[-1]
 
-    if action == "ul":
+    
+    if action == "up":
+        # update data file
+        print green + "Uploading datafile to s3..." + endc
+        cmd = "s3cmd put -v --acl-public --guess-mime-type data.json " + s3_bucket + "data.json"
+        print cmd
+        os.system(cmd);
 
-        # check to see if file exists
-        p = subprocess.Popen("s3cmd ls " + s3_bucket + "v/" + media_filename, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    # upload media
+    elif action == "ul":
+
+        # check to see if media file already exists
+        p = subprocess.Popen("s3cmd ls " + s3_bucket + "v/" + media_filename, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)        
         for line in p.stdout.readlines():
             print line,
             print red + "File exists." + endc
@@ -36,22 +45,24 @@ def main():
         new_entry = get_new_entry(media_filename)
 
         print green + "Uploading to s3..." + endc
-        p = subprocess.Popen("s3cmd put --acl-public --guess-mime-type " + media_filename + " " + s3_bucket + "v/" + media_filename, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        for line in p.stdout.readlines():
-            print line,
-        retval = p.wait()
+        cmd = "s3cmd put --acl-public --guess-mime-type " + media_path + " " + s3_bucket + "v/" + media_filename
+        print cmd
+        os.system(cmd);
+
+        print green + "Downloading data file..." + endc
+        cmd = "s3cmd get --force " + s3_bucket + "data.json"
+        print cmd
+        os.system(cmd);
 
         with open('data.json', 'r') as f:
             data = json.load(f)
-
-        #print purple + json.dumps(new_entry, indent = 2) + endc
-        #exit()
-
         data['entries'].append(new_entry)
         with open('data.json', 'w') as f:
             json.dump(data, f)
 
+        print purple + json.dumps(new_entry, indent = 2) + endc
 
+    # download media via youtube-dl
     elif action == "dl":
         print "download"