mirror of
https://github.com/hkalexling/Mango.git
synced 2025-08-05 20:35:35 -04:00
Don't return from DB blocks
This commit is contained in:
parent
39f4897fc5
commit
d6b22ef736
@ -177,16 +177,20 @@ module MangaDex
|
|||||||
end
|
end
|
||||||
|
|
||||||
def count_status(status : JobStatus)
|
def count_status(status : JobStatus)
|
||||||
|
num = 0
|
||||||
DB.open "sqlite3://#{@path}" do |db|
|
DB.open "sqlite3://#{@path}" do |db|
|
||||||
return db.query_one "select count(*) from queue where " \
|
num = db.query_one "select count(*) from queue where " \
|
||||||
"status = (?)", status.to_i, as: Int32
|
"status = (?)", status.to_i, as: Int32
|
||||||
end
|
end
|
||||||
|
num
|
||||||
end
|
end
|
||||||
|
|
||||||
def count
|
def count
|
||||||
|
num = 0
|
||||||
DB.open "sqlite3://#{@path}" do |db|
|
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
|
end
|
||||||
|
num
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_status(status : JobStatus, job : Job)
|
def set_status(status : JobStatus, job : Job)
|
||||||
|
@ -79,28 +79,29 @@ class Storage
|
|||||||
end
|
end
|
||||||
|
|
||||||
def verify_token(token)
|
def verify_token(token)
|
||||||
|
username = nil
|
||||||
DB.open "sqlite3://#{@path}" do |db|
|
DB.open "sqlite3://#{@path}" do |db|
|
||||||
begin
|
begin
|
||||||
username = db.query_one "select username from users where " \
|
username = db.query_one "select username from users where " \
|
||||||
"token = (?)", token, as: String
|
"token = (?)", token, as: String
|
||||||
return username
|
|
||||||
rescue e
|
rescue e
|
||||||
@logger.debug "Unable to verify token"
|
@logger.debug "Unable to verify token"
|
||||||
return nil
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
username
|
||||||
end
|
end
|
||||||
|
|
||||||
def verify_admin(token)
|
def verify_admin(token)
|
||||||
|
is_admin = false
|
||||||
DB.open "sqlite3://#{@path}" do |db|
|
DB.open "sqlite3://#{@path}" do |db|
|
||||||
begin
|
begin
|
||||||
return db.query_one "select admin from users where " \
|
is_admin = db.query_one "select admin from users where " \
|
||||||
"token = (?)", token, as: Bool
|
"token = (?)", token, as: Bool
|
||||||
rescue e
|
rescue e
|
||||||
@logger.debug "Unable to verify user as admin"
|
@logger.debug "Unable to verify user as admin"
|
||||||
return false
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
is_admin
|
||||||
end
|
end
|
||||||
|
|
||||||
def list_users
|
def list_users
|
||||||
@ -156,17 +157,16 @@ class Storage
|
|||||||
end
|
end
|
||||||
|
|
||||||
def get_id(path, is_title)
|
def get_id(path, is_title)
|
||||||
|
id = random_str
|
||||||
DB.open "sqlite3://#{@path}" do |db|
|
DB.open "sqlite3://#{@path}" do |db|
|
||||||
begin
|
begin
|
||||||
id = db.query_one "select id from ids where path = (?)", path,
|
id = db.query_one "select id from ids where path = (?)", path,
|
||||||
as: {String}
|
as: {String}
|
||||||
return id
|
|
||||||
rescue
|
rescue
|
||||||
id = random_str
|
|
||||||
db.exec "insert into ids values (?, ?, ?)", path, id, is_title ? 1 : 0
|
db.exec "insert into ids values (?, ?, ?)", path, id, is_title ? 1 : 0
|
||||||
return id
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
id
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_json(json : JSON::Builder)
|
def to_json(json : JSON::Builder)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user