rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-22 21:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Imfs to ServeSession, threading through generic ImfsFetcher

Browse Source
This commit is contained in:
Lucien Greathouse
2019-09-13 12:52:15 -07:00
parent 651e63a0fb
commit 8481caa67c
5 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/web/mod.rs
View File

@@ -12,16 +12,16 @@ use futures::{
use hyper::{service::Service, Body, Request, Response, Server};
use log::trace;
use crate::serve_session::ServeSession;
use crate::{imfs::new::ImfsFetcher, serve_session::ServeSession};
use self::{api::ApiService, ui::UiService};
pub struct RootService {
api: ApiService,
ui: UiService,
pub struct RootService<F> {
api: ApiService<F>,
ui: UiService<F>,
}
impl Service for RootService {
impl<F: ImfsFetcher> Service for RootService<F> {
type ReqBody = Body;
type ResBody = Body;
type Error = hyper::Error;
@@ -38,8 +38,8 @@ impl Service for RootService {
}
}
impl RootService {
pub fn new(serve_session: Arc<ServeSession>) -> RootService {
impl<F: ImfsFetcher> RootService<F> {
pub fn new(serve_session: Arc<ServeSession<F>>) -> Self {
RootService {
api: ApiService::new(Arc::clone(&serve_session)),
ui: UiService::new(Arc::clone(&serve_session)),
@@ -47,12 +47,12 @@ impl RootService {
}
}
pub struct LiveServer {
serve_session: Arc<ServeSession>,
pub struct LiveServer<F> {
serve_session: Arc<ServeSession<F>>,
}
impl LiveServer {
pub fn new(serve_session: Arc<ServeSession>) -> LiveServer {
impl<F: ImfsFetcher + Send + Sync + 'static> LiveServer<F> {
pub fn new(serve_session: Arc<ServeSession<F>>) -> Self {
LiveServer { serve_session }
}