Skip to content
This repository has been archived by the owner on Jul 28, 2021. It is now read-only.

Make proxy media filenames content-adressable #76

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions komposition.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ library
, Komposition.History
, Komposition.Import.Audio
, Komposition.Import.Audio.Sox
, Komposition.Import.Hash
, Komposition.Import.Video
, Komposition.Import.Video.FFmpeg
, Komposition.KeyMap
Expand Down Expand Up @@ -89,6 +90,8 @@ library
build-depends: base >=4.10 && <5
, async
, binary
, bytestring
, cryptonite
, deepseq
, directory
, exceptions
Expand Down Expand Up @@ -196,6 +199,7 @@ test-suite komposition-tests
, Komposition.Composition.ValidFocusTest
, Komposition.FFmpeg.CommandTest
, Komposition.FocusTest
, Komposition.Import.HashTest
, Komposition.Import.Video.FFmpegTest
, Komposition.Project.Generators
, Komposition.Project.StoreTest
Expand Down
23 changes: 23 additions & 0 deletions src/Komposition/Import/Hash.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module Komposition.Import.Hash where

import Komposition.Prelude

import Crypto.Hash as H
import Crypto.Random as R
import qualified Data.ByteString.Lazy.Char8 as Lazy
import qualified Data.ByteString.Char8 as C
import System.FilePath

-- | create a hashed basename from source file
createSHA1BaseName :: [Char] -> IO [Char]
createSHA1BaseName filepath = do
rand <- makeHex
let name = takeBaseName filepath
lazyBs = Lazy.pack (name <> rand)
pure $ hex lazyBs

hex :: Lazy.ByteString -> [Char]
hex bs = show (H.hashlazy bs :: Digest SHA1)

makeHex :: IO [Char]
makeHex = C.unpack <$> R.getRandomBytes 10
6 changes: 4 additions & 2 deletions src/Komposition/Import/Video/FFmpeg.hs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ import Data.Time.Clock
import qualified Data.Vector as V
import qualified Data.Vector.Generic as VG
import Graphics.ColorSpace as A
import Pipes (Pipe, Producer, (>->))
import qualified Pipes
import Pipes (Pipe, Producer, (>->))
import qualified Pipes.Parse as Pipes
import qualified Pipes.Prelude as Pipes hiding (show)
import Pipes.Safe
Expand All @@ -64,6 +64,7 @@ import Komposition.Duration
import Komposition.FFmpeg.Command (Command (Command))
import qualified Komposition.FFmpeg.Command as Command
import Komposition.FFmpeg.Process
import Komposition.Import.Hash (createSHA1BaseName)
import Komposition.Import.Video
import Komposition.Library
import Komposition.Progress
Expand Down Expand Up @@ -315,8 +316,9 @@ transcode'
transcode' videoSettings (view unOriginalPath -> sourceFile) fullLength outDir progressMsg
= do
liftIO (createDirectoryIfMissing True outDir)
shaBasename <- liftIO $ createSHA1BaseName sourceFile
let
proxyPath = outDir </> takeBaseName sourceFile <> ".transcoded.mp4"
proxyPath = outDir </> shaBasename <> ".transcoded.mp4"
cmd = Command
{ output = Command.FileOutput proxyPath
, inputs = pure (Command.FileSource sourceFile)
Expand Down
14 changes: 14 additions & 0 deletions test/Komposition/Import/HashTest.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module Komposition.Import.HashTest where

import Komposition.Prelude
import Test.Tasty.Hspec

import Komposition.Import.Hash

sha1 :: IO [Char]
sha1 = createSHA1BaseName "test1"

spec_hashing :: Spec
spec_hashing = do
it "creates a different SHA1 given the same basename" $
join (shouldNotBe <$> sha1 <*> sha1)