move sort into haskell

1 files changed, 9 insertions, 6 deletions

diff --git a/vmail/src/WebApp.hs b/vmail/src/WebApp.hs
index 7fbd1c4..3fcf243 100644
--- a/vmail/src/WebApp.hs
+++ b/vmail/src/WebApp.hs
@@ -34,7 +34,7 @@ import           Servant.JS                  (vanillaJS, jsForAPI)
 import           Servant.Multipart
 import           System.Directory
 import qualified Rebase.Data.Text as Text
-import           Database.SQLite.Simple hiding ((:.))
+import           Database.SQLite.Simple hiding ((:.), changes)
 import System.Random
 import System.Systemd.Daemon
 
@@ -363,6 +363,7 @@ addBlob addr uuid blobData@RTCBlob{..} = do
   queryG <&> recordBlob uuid now addr blobData >>= updateG
   return "success"
 
+withoutMetaData :: WithMetaData a -> a
 withoutMetaData (WithMetaData _ _ payload) = payload
 
 saveVideoClip :: FilePath -> [FilePath] -> Float -> Float -> IO ()
@@ -371,8 +372,8 @@ saveVideoClip outputFile inputChunks _ stopTime | stopTime == 0 = do
   cmd_ (AddEnv "output" outputFile)
        (["sh", "-xc", cmdScript, "sh"] ++ inputChunks)
 saveVideoClip outputFile inputChunks startTime stopTime = do
-  -- let cmdScript = "printf '%s\n' \"$@\" | sort -n | xargs cat | ffmpeg -i - -c:v libx264 -f mp4 -ss \"$start\" -t \"$stop\" \"$output\"" :: String
-  let cmdScript = "printf '%s\n' \"$@\" | sort -n | xargs cat | ffmpeg -i - -c:v libvpx -c:a libvorbis -ss \"$start\" -t \"$stop\" \"$output\"" :: String
+  -- let cmdScript = "cat \"$@\" | ffmpeg -i - -c:v libx264 -f mp4 -ss \"$start\" -t \"$stop\" \"$output\"" :: String
+  let cmdScript = "cat \"$@\" | ffmpeg -i - -c:v libvpx -c:a libvorbis -ss \"$start\" -t \"$stop\" \"$output\"" :: String
   cmd_ (AddEnv "start" $ show startTime)
        (AddEnv "stop" $ show (stopTime - startTime))
        (AddEnv "output" outputFile)
@@ -391,11 +392,13 @@ saveMessage addr uuid start stop = do
   g <- queryG
   let changes :: [MessageChange]
       changes = view (messages . at uuid . _Just . messageModifications . to (fmap withoutMetaData)) g
-      blobs :: [FilePath]
-      blobs = reverse $ [inputDir </> blobFileName blob | AppendBlob blob <- changes]
+      blobs :: [RTCBlob]
+      blobs = [blob | AppendBlob blob <- changes]
+      inputVideos :: [FilePath]
+      inputVideos = (inputDir </>) . blobFileName <$> sortBy (comparing blobSeqNo) blobs
   updateG $ g & messageAppend uuid now addr (SetStartTime $ toRational start)
               & messageAppend uuid now addr (SetStopTime $ toRational stop)
   -- TODO: pipe concatenated blobs into ffmpeg, saving result into htdocs, then redirect to the hosted file
-  liftIO $ saveVideoClip tempFile blobs start stop 
+  liftIO $ saveVideoClip tempFile inputVideos start stop
   liftIO $ renameFile tempFile outputFile
   return outputUrl