test/vieter
1
0
Fork 0
forked from vieter-v/vieter
Code Issues Pull requests Releases Activity

feat(server): partially migrated repos API to sqlite

Browse source
This commit is contained in:
Jef Roosens 2022-05-01 22:47:00 +02:00
parent 03318586ed
commit 891a206116
Signed by untrusted user: Jef Roosens
GPG key ID: B75D4F293C7052DB
5 changed files with 181 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

109
src/server/git.v
View file

@ -5,6 +5,7 @@ import git
import net.http
import rand
import response { new_data_response, new_response }
import db
const repos_file = 'repos.json'
@ -15,37 +16,39 @@ fn (mut app App) get_repos() web.Result {
return app.json(http.Status.unauthorized, new_response('Unauthorized.'))
}
repos := rlock app.git_mutex {
git.read_repos(app.conf.repos_file) or {
app.lerror('Failed to read repos file: $err.msg()')
repos := app.db.get_git_repos()
// repos := rlock app.git_mutex {
// git.read_repos(app.conf.repos_file) or {
// app.lerror('Failed to read repos file: $err.msg()')
return app.status(http.Status.internal_server_error)
}
}
// return app.status(http.Status.internal_server_error)
// }
//}
return app.json(http.Status.ok, new_data_response(repos))
}
// get_single_repo returns the information for a single repo.
['/api/repos/:id'; get]
fn (mut app App) get_single_repo(id string) web.Result {
fn (mut app App) get_single_repo(id int) web.Result {
if !app.is_authorized() {
return app.json(http.Status.unauthorized, new_response('Unauthorized.'))
}
repos := rlock app.git_mutex {
git.read_repos(app.conf.repos_file) or {
app.lerror('Failed to read repos file.')
// repos := rlock app.git_mutex {
// git.read_repos(app.conf.repos_file) or {
// app.lerror('Failed to read repos file.')
return app.status(http.Status.internal_server_error)
}
}
// return app.status(http.Status.internal_server_error)
// }
//}
if id !in repos {
return app.not_found()
}
// if id !in repos {
// return app.not_found()
//}
repo := repos[id]
// repo := repos[id]
repo := app.db.get_git_repo(id) or { return app.not_found() }
return app.json(http.Status.ok, new_data_response(repo))
}
@ -65,62 +68,66 @@ fn (mut app App) post_repo() web.Result {
params['arch'] = app.conf.default_arch
}
new_repo := git.repo_from_params(params) or {
new_repo := db.git_repo_from_params(params) or {
return app.json(http.Status.bad_request, new_response(err.msg()))
}
id := rand.uuid_v4()
app.db.add_git_repo(new_repo)
mut repos := rlock app.git_mutex {
git.read_repos(app.conf.repos_file) or {
app.lerror('Failed to read repos file.')
// id := rand.uuid_v4()
return app.status(http.Status.internal_server_error)
}
}
// mut repos := rlock app.git_mutex {
// git.read_repos(app.conf.repos_file) or {
// app.lerror('Failed to read repos file.')
// We need to check for duplicates
for _, repo in repos {
if repo == new_repo {
return app.json(http.Status.bad_request, new_response('Duplicate repository.'))
}
}
// return app.status(http.Status.internal_server_error)
// }
//}
// repos := app.db.get_git_repos()
repos[id] = new_repo
//// We need to check for duplicates
// for _, repo in repos {
// if repo == new_repo {
// return app.json(http.Status.bad_request, new_response('Duplicate repository.'))
// }
//}
lock app.git_mutex {
git.write_repos(app.conf.repos_file, &repos) or {
return app.status(http.Status.internal_server_error)
}
}
// repos[id] = new_repo
// lock app.git_mutex {
// git.write_repos(app.conf.repos_file, &repos) or {
// return app.status(http.Status.internal_server_error)
// }
//}
return app.json(http.Status.ok, new_response('Repo added successfully.'))
}
// delete_repo removes a given repo from the server's list.
['/api/repos/:id'; delete]
fn (mut app App) delete_repo(id string) web.Result {
fn (mut app App) delete_repo(id int) web.Result {
if !app.is_authorized() {
return app.json(http.Status.unauthorized, new_response('Unauthorized.'))
}
mut repos := rlock app.git_mutex {
git.read_repos(app.conf.repos_file) or {
app.lerror('Failed to read repos file.')
/* mut repos := rlock app.git_mutex { */
/* git.read_repos(app.conf.repos_file) or { */
/* app.lerror('Failed to read repos file.') */
return app.status(http.Status.internal_server_error)
}
}
/* return app.status(http.Status.internal_server_error) */
/* } */
/* } */
if id !in repos {
return app.not_found()
}
/* if id !in repos { */
/* return app.not_found() */
/* } */
repos.delete(id)
/* repos.delete(id) */
app.db.delete_git_repo(id)
lock app.git_mutex {
git.write_repos(app.conf.repos_file, &repos) or { return app.server_error(500) }
}
/* lock app.git_mutex { */
/* git.write_repos(app.conf.repos_file, &repos) or { return app.server_error(500) } */
/* } */
return app.json(http.Status.ok, new_response('Repo removed successfully.'))
}

5
src/server/server.v
View file

@ -5,6 +5,7 @@ import os
import log
import repo
import util
import db
const port = 8000
@ -16,6 +17,7 @@ pub mut:
repo repo.RepoGroupManager [required; web_global]
// This is used to claim the file lock on the repos file
git_mutex shared util.Dummy
db db.VieterDb
}
// server starts the web server & starts listening for requests
@ -53,9 +55,12 @@ pub fn server(conf Config) ? {
util.exit_with_message(1, 'Failed to create download directory.')
}
db := db.init('test.db') or { util.exit_with_message(1, 'Failed to initialize database.') }
web.run(&App{
logger: logger
conf: conf
repo: repo
db: db
}, server.port)
}