serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add theme to ArticleRevisionStub, RebaseResult and related.

Browse source 
This paves the way for explicitly storing the theme in the database
This commit is contained in:
Magnus Hovland Hoff 2018-09-22 23:16:58 +02:00
parent c82228f019
commit 8f1e95bdde
3 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/models.rs
View file

@ -47,6 +47,8 @@ pub struct ArticleRevisionStub {
pub latest: bool,
pub author: Option<String>,
pub theme: Theme,
}
impl ArticleRevisionStub {

11
src/resources/article_resource.rs
View file

@ -11,7 +11,7 @@ use mimes::*;
use rendering::render_markdown;
use site::Layout;
use state::{State, UpdateResult, RebaseConflict};
use theme;
use theme::Theme;
use web::{Resource, ResponseFuture};
use super::changes_resource::QueryParameters;
@ -140,6 +140,7 @@ impl Resource for ArticleResource {
revision: i32,
title: &'a str,
body: &'a str,
theme: Theme,
rendered: &'a str,
last_updated: &'a str,
}
@ -165,6 +166,7 @@ impl Resource for ArticleResource {
revision: updated.revision,
title: &updated.title,
body: &updated.body,
theme: updated.theme,
rendered: &Template {
title: &updated.title,
rendered: render_markdown(&updated.body),
@ -177,7 +179,7 @@ impl Resource for ArticleResource {
}).expect("Should never fail"))
),
UpdateResult::RebaseConflict(RebaseConflict {
base_article, title, body
base_article, title, body, theme
}) => {
let title = title.flatten();
let body = body.flatten();
@ -190,6 +192,7 @@ impl Resource for ArticleResource {
revision: base_article.revision,
title: &title,
body: &body,
theme,
rendered: &Template {
title: &title,
rendered: render_markdown(&body),
@ -230,7 +233,7 @@ impl Resource for ArticleResource {
.with_body("See other")
),
UpdateResult::RebaseConflict(RebaseConflict {
base_article, title, body
base_article, title, body, theme
}) => {
let title = title.flatten();
let body = body.flatten();
@ -240,7 +243,7 @@ impl Resource for ArticleResource {
.with_body(Layout {
base: None,
title: &title,
theme: theme::theme_from_str_hash(&title),
theme,
body: &Template {
revision: base_article.revision,
last_updated: Some(&last_updated(

39
src/state.rs
View file

@ -10,6 +10,7 @@ use r2d2_diesel::ConnectionManager;
use merge;
use models;
use schema::*;
use theme::Theme;
#[derive(Clone)]
pub struct State {
@ -45,11 +46,12 @@ pub struct RebaseConflict {
pub base_article: models::ArticleRevisionStub,
pub title: merge::MergeResult<char>,
pub body: merge::MergeResult<String>,
pub theme: Theme,
}
#[derive(Debug, PartialEq)]
enum RebaseResult {
Clean { title: String, body: String },
Clean { title: String, body: String, theme: Theme },
Conflict(RebaseConflict),
}
@ -161,6 +163,7 @@ impl<'a> SyncState<'a> {
title,
latest,
author,
::db::sqlfunc::theme_from_str_hash(title),
))
.load(self.db_connection)?
)
@ -220,6 +223,15 @@ impl<'a> SyncState<'a> {
{
let mut title_a = title;
let mut body_a = body;
let mut theme_a = ::theme::theme_from_str_hash(&title_a);
// TODO: Improve this implementation.
// Weakness: If the range of revisions is big, _one_ request from the
// client can cause _many_ database requests, cheaply causing lots
// of work for the server. Possible attack vector.
// Weakness: When the range is larger than just one iteration, the
// same title and body are retrieved from the database multiple
// times. Unnecessary extra copies.
for revision in existing_base_revision..target_base_revision {
let mut stored = article_revisions::table
@ -230,25 +242,33 @@ impl<'a> SyncState<'a> {
.select((
article_revisions::title,
article_revisions::body,
::db::sqlfunc::theme_from_str_hash(article_revisions::title),
))
.load::<(String, String)>(self.db_connection)?;
.load::<(String, String, Theme)>(self.db_connection)?;
let (title_b, body_b) = stored.pop().expect("Application layer guarantee");
let (title_o, body_o) = stored.pop().expect("Application layer guarantee");
let (title_b, body_b, theme_b) = stored.pop().expect("Application layer guarantee");
let (title_o, body_o, theme_o) = stored.pop().expect("Application layer guarantee");
use merge::MergeResult::*;
fn merge_themes(a: Theme, o: Theme, b: Theme) -> Theme {
// Last change wins
if a != o { a } else { b }
}
let update = {
let title_merge = merge::merge_chars(&title_a, &title_o, &title_b);
let body_merge = merge::merge_lines(&body_a, &body_o, &body_b);
let theme = merge_themes(theme_a, theme_o, theme_b);
match (title_merge, body_merge) {
(Clean(title), Clean(body)) => (title, body),
(Clean(title), Clean(body)) => (title, body, theme),
(title_merge, body_merge) => {
return Ok(RebaseResult::Conflict(RebaseConflict {
base_article: self.get_article_revision_stub(article_id, revision+1)?.expect("Application layer guarantee"),
title: title_merge,
body: body_merge.to_strings(),
theme,
}));
},
}
@ -256,9 +276,10 @@ impl<'a> SyncState<'a> {
title_a = update.0;
body_a = update.1;
theme_a = update.2;
}
Ok(RebaseResult::Clean { title: title_a, body: body_a })
Ok(RebaseResult::Clean { title: title_a, body: body_a, theme: theme_a })
}
pub fn update_article(&self, article_id: i32, base_revision: i32, title: String, body: String, author: Option<String>)
@ -290,8 +311,8 @@ impl<'a> SyncState<'a> {
let rebase_result = self.rebase_update(article_id, latest_revision, base_revision, title, body)?;
let (title, body) = match rebase_result {
RebaseResult::Clean { title, body } => (title, body),
let (title, body, theme) = match rebase_result {
RebaseResult::Clean { title, body, theme } => (title, body, theme),
RebaseResult::Conflict(x) => return Ok(UpdateResult::RebaseConflict(x)),
};
@ -641,7 +662,7 @@ mod test {
match conflict_edit {
UpdateResult::Success(..) => panic!("Expected conflict"),
UpdateResult::RebaseConflict(RebaseConflict { base_article, title, body }) => {
UpdateResult::RebaseConflict(RebaseConflict { base_article, title, body, theme: _ }) => {
assert_eq!(first_edit.revision, base_article.revision);
assert_eq!(title, merge::MergeResult::Clean(article.title.clone()));
assert_eq!(body, merge::MergeResult::Conflicted(vec![