Don't return from DB blocks

This commit is contained in:
Alex Ling 2020-04-10 15:24:49 +00:00
parent 39f4897fc5
commit d6b22ef736
2 changed files with 15 additions and 11 deletions

View File

@ -177,16 +177,20 @@ module MangaDex
end
def count_status(status : JobStatus)
num = 0
DB.open "sqlite3://#{@path}" do |db|
return db.query_one "select count(*) from queue where " \
"status = (?)", status.to_i, as: Int32
num = db.query_one "select count(*) from queue where " \
"status = (?)", status.to_i, as: Int32
end
num
end
def count
num = 0
DB.open "sqlite3://#{@path}" do |db|
return db.query_one "select count(*) from queue", as: Int32
num = db.query_one "select count(*) from queue", as: Int32
end
num
end
def set_status(status : JobStatus, job : Job)

View File

@ -79,28 +79,29 @@ class Storage
end
def verify_token(token)
username = nil
DB.open "sqlite3://#{@path}" do |db|
begin
username = db.query_one "select username from users where " \
"token = (?)", token, as: String
return username
rescue e
@logger.debug "Unable to verify token"
return nil
end
end
username
end
def verify_admin(token)
is_admin = false
DB.open "sqlite3://#{@path}" do |db|
begin
return db.query_one "select admin from users where " \
"token = (?)", token, as: Bool
is_admin = db.query_one "select admin from users where " \
"token = (?)", token, as: Bool
rescue e
@logger.debug "Unable to verify user as admin"
return false
end
end
is_admin
end
def list_users
@ -156,17 +157,16 @@ class Storage
end
def get_id(path, is_title)
id = random_str
DB.open "sqlite3://#{@path}" do |db|
begin
id = db.query_one "select id from ids where path = (?)", path,
as: {String}
return id
rescue
id = random_str
db.exec "insert into ids values (?, ?, ?)", path, id, is_title ? 1 : 0
return id
end
end
id
end
def to_json(json : JSON::Builder)