diff --git a/app.py b/app.py index 8653602..ae6c4b5 100644 --- a/app.py +++ b/app.py @@ -959,6 +959,11 @@ def upload_file(): if "ALLOW_UPLOADS" in vidzyconfig.config: if vidzyconfig.config["ALLOW_UPLOADS"] is False: return "This instance does not allow uploading videos" + + video_description = "" + if request.form.get("description") != None and request.form.get("tags") != None: + video_description = request.form.get("description") + video_description += " " + request.form.get("tags") if request.method == 'POST': # check if the post request has the file part @@ -976,7 +981,7 @@ def upload_file(): return 'File is too large. Please upload a file smaller than 99MB.' if file and allowed_file(file.filename): - filename = datetime.today().strftime('%Y%m%d') + secure_filename(file.filename) + filename = datetime.today().strftime('%Y%m%d') + secure_filename(file.filename) + "__" + str(random.randrange(0,9999)) if s3_enabled == 'True': new_filename = uuid.uuid4().hex + '.' + file.filename.rsplit('.', 1)[1].lower() @@ -993,7 +998,7 @@ def upload_file(): cur = mysql.connection.cursor() - cur.execute( """INSERT INTO shorts (title, url, user_id, date_uploaded) VALUES (%s,%s,%s,%s)""", (request.form.get("title"), s3_fileurl, str(session["user"]["id"]), datetime.now().strftime('%Y-%m-%d')) ) + cur.execute( """INSERT INTO shorts (title, url, user_id, date_uploaded, description) VALUES (%s,%s,%s,%s,%s)""", (request.form.get("title"), s3_fileurl, str(session["user"]["id"]), datetime.now().strftime('%Y-%m-%d'), video_description) ) mysql.connection.commit() else: temp_filepath = os.path.join(app.config['UPLOAD_FOLDER'], 'temp_video.' + file.filename.rsplit('.', 1)[1].lower()) @@ -1024,92 +1029,11 @@ def upload_file(): cur = mysql.connection.cursor() - cur.execute( """INSERT INTO shorts (title, url, user_id, date_uploaded) VALUES (%s,%s,%s,%s)""", (request.form.get("title"), filename, str(session["user"]["id"]), datetime.now().strftime('%Y-%m-%d')) ) + cur.execute( """INSERT INTO shorts (title, url, user_id, date_uploaded, description) VALUES (%s,%s,%s,%s,%s)""", (request.form.get("title"), filename, str(session["user"]["id"]), datetime.now().strftime('%Y-%m-%d'), video_description) ) mysql.connection.commit() return redirect(url_for('index_page')) - return ''' - - - - - - Upload a New Video - - - -
-

Upload a New Video

-
- -

- -

- -
-
- - - - ''' + return render_template("upload_video.html") @app.route("/onboarding") def onboarding_page(): diff --git a/templates/upload_video.html b/templates/upload_video.html new file mode 100644 index 0000000..46cdfbd --- /dev/null +++ b/templates/upload_video.html @@ -0,0 +1,133 @@ + + + + + + Upload a New Video + + + + +
+

Upload a New Video

+
+ +

+ +

+ +

+ + + + +
+ #travel + #holiday + #technology +
+ +

+ +
+
+ + + + + \ No newline at end of file