From 7f79a49bff7883db126481f8c8a795aa312e3505 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Tue, 26 Oct 2021 21:41:39 +0200 Subject: cosmetics --- src/database.nim | 2 +- src/dbUtils.nim | 16 ++++++++-------- src/short.nim | 6 +++--- src/templates/noshort.html | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/database.nim b/src/database.nim index 8094f31..1ffc0df 100644 --- a/src/database.nim +++ b/src/database.nim @@ -22,7 +22,7 @@ const migrations = [ const latestVersion = migrations.len proc Migrate*(db: DbConn): bool {.raises: [].} = - var currentVersion : int + var currentVersion: int try: currentVersion = db.value("SELECT version FROM schema_version;").get().fromDbValue(int) except SqliteError: diff --git a/src/dbUtils.nim b/src/dbUtils.nim index bdbcf14..cfe54cf 100644 --- a/src/dbUtils.nim +++ b/src/dbUtils.nim @@ -1,13 +1,13 @@ import std/times import tiny_sqlite -proc toDbValue*(t: DateTime): DbValue {.raises: [].}= +proc toDbValue*(t: DateTime): DbValue {.raises: [].} = DbValue(kind: sqliteText, strVal: $t) -proc fromDbValue*(value: DbValue, T: typedesc[DateTime]): DateTime {.raises: [].}= - try: - case value.kind: - of sqliteText: return times.parse(value.strVal, "yyyy-MM-dd'T'HH:mm:sszzz") - else: return - except TimeParseError: - return +proc fromDbValue*(value: DbValue, T: typedesc[DateTime]): DateTime {.raises: [].} = + try: + case value.kind: + of sqliteText: return times.parse(value.strVal, "yyyy-MM-dd'T'HH:mm:sszzz") + else: return + except TimeParseError: + return diff --git a/src/short.nim b/src/short.nim index fa5486a..7057779 100644 --- a/src/short.nim +++ b/src/short.nim @@ -13,7 +13,7 @@ const favicon = staticRead("../static/favicon.ico") var db {.threadvar.}: DbConn -proc initDB() {.raises: [SqliteError].}= +proc initDB() {.raises: [SqliteError].} = if not db.isOpen(): db = openDatabase("data/short.db") if not db.Migrate(): @@ -36,7 +36,7 @@ func renderNoShort(req: ShortUrl): string {.raises: [].} = func renderError(code: int, msg: string): string {.raises: [].} = compileTemplateFile(getScriptDir() / "templates/error.html") -proc handleToken(token:string): (HttpCode, string) {.raises: [].} = +proc handleToken(token: string): (HttpCode, string) {.raises: [].} = try: let tokenRegexp = re"^[\w]{24}$" if not match(token, tokenRegexp): @@ -89,7 +89,7 @@ proc handleIndexPost(params: Table[string, string]): (HttpCode, string) {.raises return (Http400, renderError(400, "Bad Request")) input.Token = $genOid() input.Created = times.now() - input.Expires = input.Created + initDuration(minutes=exp) + input.Expires = input.Created + initDuration(minutes = exp) try: db.AddUrl(input) except SqliteError: diff --git a/src/templates/noshort.html b/src/templates/noshort.html index e0be436..976e911 100644 --- a/src/templates/noshort.html +++ b/src/templates/noshort.html @@ -2,9 +2,9 @@ {% block content %}

URL not found!

- This url does not exist or has expired, sorry! +This url does not exist or has expired, sorry!

- Go back +Go back

{% endblock %} -- cgit v1.2.3