rm scfg wip
This commit is contained in:
parent
8c2c90b3c2
commit
872cf1b72f
13 changed files with 156 additions and 343 deletions
|
|
@ -150,8 +150,8 @@ let load_page = function
|
|||
let load_quickview opt =
|
||||
opt
|
||||
|> Option.map (fun (rect, v) ->
|
||||
( rect
|
||||
, match v with Ready _ | Not_found _ -> v | Loading _ -> load_post v ) )
|
||||
( rect
|
||||
, match v with Ready _ | Not_found _ -> v | Loading _ -> load_post v ) )
|
||||
|
||||
let load_model t =
|
||||
let session = Db.get_session () in
|
||||
|
|
@ -258,10 +258,9 @@ let do_action : Client_types.action -> t -> t =
|
|||
let quickview =
|
||||
opt |> Option.map (fun (rect, v) -> (rect, Loading v)) |> load_quickview
|
||||
in
|
||||
begin
|
||||
match quickview with
|
||||
| Some (_, Loading post_id) -> Network.GET.post post_id
|
||||
| _ -> ()
|
||||
begin match quickview with
|
||||
| Some (_, Loading post_id) -> Network.GET.post post_id
|
||||
| _ -> ()
|
||||
end;
|
||||
{ t with quickview }
|
||||
| Image_change opened_image -> { t with opened_image }
|
||||
|
|
@ -270,15 +269,14 @@ let do_action : Client_types.action -> t -> t =
|
|||
let do_data_update : Client_types.data_update -> t -> t =
|
||||
fun action t ->
|
||||
Fmt.pr {|do data update: "%a"@.|} pp_data_update action;
|
||||
begin
|
||||
match action with
|
||||
| Post_update v -> Db.add_post v
|
||||
| Thread_update thread_w_reply ->
|
||||
Db.update_thread_w_reply (Some thread_w_reply)
|
||||
| Catalog_update l -> Db.update_catalog l
|
||||
| User_update u -> Db.update_user (Some u)
|
||||
| Reports_update reports -> Db.update_reports reports
|
||||
| Session_update session -> Db.update_session session
|
||||
begin match action with
|
||||
| Post_update v -> Db.add_post v
|
||||
| Thread_update thread_w_reply ->
|
||||
Db.update_thread_w_reply (Some thread_w_reply)
|
||||
| Catalog_update l -> Db.update_catalog l
|
||||
| User_update u -> Db.update_user (Some u)
|
||||
| Reports_update reports -> Db.update_reports reports
|
||||
| Session_update session -> Db.update_session session
|
||||
end;
|
||||
load_model t
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue