nahakubuilder/flask_url_shortener
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Went back to each url generating a new token even if they already exist in the database

Browse Source
This commit is contained in:
xemeds
2020-08-21 10:22:01 +03:00
parent 307f7f8f37
commit 17838b61ab
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tiny0/models.py
+1 -1
View File
@@ -3,7 +3,7 @@ from tiny0 import db
class URL(db.Model):
id = db.Column(db.Integer, primary_key=True)
token = db.Column(db.String(6), index=True, unique=True, nullable=False)
url = db.Column(db.String(2000), index=True, unique=True, nullable=False)
url = db.Column(db.String(2000), nullable=False)
def __repr__(self):
return f"'{self.id}' '{self.token}' '{self.url}'"
tiny0/routes.py
+8 -31
View File
@@ -13,40 +13,17 @@ def index():
# If the form was valid
if form.validate_on_submit():
# Generate a valid token
token = gen_valid_token()
# If the given url is a rick roll
if ("youtube.com/watch?v=dQw4w9WgXcQ" in form.url.data) or ("youtu.be/dQw4w9WgXcQ" in form.url.data):
# Generate a valid token
token = gen_valid_token()
# Add the token and the given url to the database
db.session.add(URL(token=token, url=form.url.data))
db.session.commit()
# Add the token and the given url to the database
db.session.add(URL(token=token, url=form.url.data))
db.session.commit()
# Return the url page with the shortened url
return render_template("url.html", url=WEBSITE_DOMAIN + "/" + token)
# Return the url page with the shortened url
return render_template("url.html", url=WEBSITE_DOMAIN + "/" + token)
# Query the urls that are not a rick roll in the database
query = URL.query.filter_by(url=form.url.data).first()
# If the url exists in the database
if query:
# Return the url page with the previously shortened url
return render_template("url.html", url=WEBSITE_DOMAIN + "/" + query.token)
# Else if the url does not exist in the database
else:
# Generate a valid token
token = gen_valid_token()
# Add the token and the given url to the database
db.session.add(URL(token=token, url=form.url.data))
db.session.commit()
# Return the url page with the shortened url
return render_template("url.html", url=WEBSITE_DOMAIN + "/" + token)
# Else if the form was invalid or not submitted
# If the form was invalid or not submitted
else:
# Return the index page with the form
return render_template("index.html", form=form)