Fix: Handle Non-ascii Unicode characters in ffprobe output

Arthi-chaud · Aug 10, 2024 · 7019816 · 7019816
1 parent 8c448fb
commit 7019816
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/FFProbe.hs b/src/FFProbe.hs
@@ -4,7 +4,8 @@ module FFProbe (
 ) where
 
 import Data.Aeson (FromJSON, eitherDecodeStrict)
-import Data.ByteString.Char8 (pack)
+import Data.Text (pack)
+import Data.Text.Encoding (encodeUtf8)
 import FFProbe.Data.Chapter (Chapter)
 import FFProbe.Data.Format (Format)
 import FFProbe.Data.Stream (Stream)
@@ -25,5 +26,5 @@ ffprobe :: String -> IO (Either String FFProbeData)
 ffprobe path = do
     probeRes <- execFFProbe path
     return $ case probeRes of
-        Right rawJson -> eitherDecodeStrict (pack rawJson)
+        Right rawJson -> eitherDecodeStrict (encodeUtf8 $ pack rawJson)
         Left err -> Left err
diff --git a/test/FFProbe/TestFFProbe.hs b/test/FFProbe/TestFFProbe.hs
@@ -25,3 +25,10 @@ specs = describe "Running ffprobe" $ do
                 title (chapters ffprobeData !! 1) `shouldBe` Just "Middle"
                 title (chapters ffprobeData !! 2) `shouldBe` Just "End"
             )
+    it "Should Succeed at parsing unicode characters" $ do
+        res <- ffprobe "test/assets/test-unicode.mp4"
+        shouldBeRight
+            res
+            ( \ffprobeData -> do
+                title (head (chapters ffprobeData)) `shouldBe` Just "Début"
+            )
diff --git a/test/assets/test-unicode.mp4 b/test/assets/test-unicode.mp4