Merge pull request #137 from store2be/use-ordered-futures-in-merge

🐛 Fix out-of-order PDFs in merge documents

CHANGELOG.md

@@ -5,10 +5,15 @@
 
 ## Unreleased
 
-### Fixes
+## [0.4.1] - 2019-10-09
+- Use `futures::stream::FuturesOrdered` to maintain the order of the merge PDFs.
 
+## [0.4.0] - 2019-08-21
+- Use `async-await`
+- Replace `tide` with `warp`
 - Save merge assets with V4 UUIDs as file names instead of using the original file names to avoid errors when users upload files with the same name.
 - Reject merge requests with an empty list of documents to merge
+- Bug fixes and cleanup
 
 ## [0.3.0] - 2018-05-11
 - Add Sentry for error tracking

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "papers"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["store2be <[email protected]>"]
 edition = "2018"
 

src/papers/merge.rs

@@ -105,7 +105,7 @@ impl Merger {
         &self,
         asset_paths: Vec<PathBuf>,
     ) -> Result<Vec<PathBuf>, failure::Error> {
-        let mut futures = futures::stream::FuturesUnordered::new();
+        let mut futures = futures::stream::FuturesOrdered::new();
 
         for path in asset_paths.into_iter() {
             let logger = self.workspace.logger().clone();