diff --git a/Gifcurry.cabal b/Gifcurry.cabal --- a/Gifcurry.cabal +++ b/Gifcurry.cabal @@ -1,5 +1,5 @@ name: Gifcurry -version: 0.1.0.6 +version: 0.1.1.0 synopsis: Create animated GIFs, overlaid with optional text, from video files. description: GIF creation utility. homepage: https://github.com/lettier/gifcurry diff --git a/Gifcurry.hs b/Gifcurry.hs --- a/Gifcurry.hs +++ b/Gifcurry.hs @@ -5,50 +5,57 @@ import System.Environment import System.Process import System.IO.Temp +import System.Directory import System.Exit import Data.List import Control.Exception -gif [is, os, st, dr, wd, qa, ttx, btx] = do +gif [is, os, st, dr, wd, qa, ttx, btx] = withTempDirectory "." "frames" $ \tmpDir -> do putStrLn $ "\nInput file: " ++ is putStrLn $ "Start second: " ++ st putStrLn $ "Duration: " ++ dr ++ " seconds" putStrLn $ "GIF width: " ++ wd ++ "px" putStrLn $ "Quality: " ++ (quality qa) ++ "%" - putStrLn $ "Top text: " ++ (ttx) - putStrLn $ "Bottom text: " ++ (btx) + putStrLn $ "Top text: " ++ ttx + putStrLn $ "Bottom text: " ++ btx putStrLn $ "\nWriting temporary frames to... " ++ tmpDir - result <- try (readProcess "ffmpeg" [ - "-nostats", - "-loglevel", - "panic", - "-an", - "-ss", - st, - "-i", - is, - "-t", - dr, - "-r", - "15", - "-q:v", - "2", - "-vf", - "scale=" ++ wd ++ ":-1", - "-f", - "image2", - tmpDir ++ "/%010d.png" ] "") :: IO (Either IOError String) - result <- case result of - Left ex -> return (1) - Right val -> return (0) - putStrLn $ "Writing your GIF to... " ++ os - result <- try (convert qa tmpDir os wd ttx btx) :: IO (Either IOError String) - result <- case result of - Left ex -> return (1) - Right val -> return (0) - putStrLn "Done." - return (result) + fileExists <- doesFileExist is + if fileExists + then do + result <- try (readProcess "ffmpeg" [ + "-nostats", + "-loglevel", + "panic", + "-an", + "-ss", + st, + "-i", + is, + "-t", + dr, + "-r", + "15", + "-q:v", + "2", + "-vf", + "scale=" ++ wd ++ ":-1", + "-f", + "image2", + tmpDir ++ "/%010d.png" ] "") :: IO (Either IOError String) + result <- case result of + Left ex -> return 1 + Right val -> return 0 + putStrLn $ "Writing your GIF to... " ++ os + result <- try (convert qa tmpDir os wd ttx btx) :: IO (Either IOError String) + result <- case result of + Left ex -> return 1 + Right val -> return 0 + putStrLn "Done." + return result + else do + putStrLn "Video file does not exist." + return 0 convert qa dr os wd ttx btx = readProcess "convert" ([ "-quiet", diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -70,9 +70,9 @@ sudo apt-get update sudo apt-get install ffmpeg imagemagick # Find the latest release at https://github.com/lettier/gifcurry/releases -wget https://github.com/lettier/gifcurry/releases/download/*/gifcurry*.tar.gz -tar xvfz gifcurry*.tar.gz -cd gifcurry*/bin +wget https://github.com/lettier/gifcurry/releases/download/*/gifcurry-linux*.tar.gz +tar xvfz gifcurry-linux*.tar.gz +cd gifcurry-linux*/bin ./gifcurry_gui ./gifcurry_cli ``` @@ -90,7 +90,28 @@ ### Mac OS X El Capitan +#### Prebuilt + ``` +# If you don't have Homebrew +/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" +brew install ffmpeg +brew install imagemagick +brew install ghostscript +brew install wget +# Find the latest release at https://github.com/lettier/gifcurry/releases +wget https://github.com/lettier/gifcurry/releases/download/*/gifcurry-macosx*.tar.gz +tar xvfz gifcurry-macosx*.tar.gz +cd gifcurry-macosx*/bin +./gifcurry_gui +./gifcurry_cli +``` + +#### Build + +``` +# If you don't have Homebrew +/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew update brew install xcode brew install git @@ -105,6 +126,7 @@ brew install pango brew install ffmpeg brew install imagemagick +brew install ghostscript git clone git@github.com:lettier/gifcurry.git cd gifcurry cabal sandbox init @@ -112,7 +134,7 @@ cabal configure cabal install alex happy -j cabal install gtk2hs-buildtools -j -cabal install gifcurry -j --enable-relocatable +cabal install gifcurry -j cd .cabal-sandbox/bin/ ./gifcurry_gui ./gifcurry_cli diff --git a/data/gui.glade b/data/gui.glade --- a/data/gui.glade +++ b/data/gui.glade @@ -16,9 +16,13 @@ gtk-open + 400 False + center Gifcurry - lettier.com + False mouse + 400 icon.ico center @@ -32,6 +36,7 @@ False Select an input file. True + False Select an Input File @@ -215,9 +220,57 @@ + + True + False + True + + + True + False + First frame preview. + center + center + gtk-missing-image + + + True + True + 0 + + + + + True + False + Last frame preview. + 0.96999999999999997 + center + center + gtk-missing-image + + + True + True + end + 1 + + + + + True + True + 7 + + + + + + True False + True Create @@ -259,13 +312,14 @@ False True - 7 + 11 True False + True button @@ -302,58 +356,45 @@ False True - 8 + 12 True + False False - - - True - False - 5 - 5 - Status - - - False - True - 0 - - - - - True - False - vertical - - - False - True - 1 - - + True + True + top True - True + False + True + False + True + True False + False Ready. + none False + gtk-info + False + False True True - 2 + 0 True True - 9 + 13 diff --git a/gui_src/Main.hs b/gui_src/Main.hs --- a/gui_src/Main.hs +++ b/gui_src/Main.hs @@ -4,6 +4,8 @@ import System.Directory import System.Process import System.Info +import System.IO.Temp +import Control.Monad import Data.Char import Data.List import Control.Concurrent @@ -33,16 +35,26 @@ open_button <- load_button builder "open_button" giphy_button <- load_button builder "giphy_link_button" imgur_button <- load_button builder "imgur_link_button" + first_frame_image <- load_image builder "first_frame_image" + last_frame_image <- load_image builder "last_frame_image" -- Bug in Glade does not allow setting the link button label. buttonSetLabel giphy_button "Giphy" buttonSetLabel imgur_button "Imgur" - entrySetText start_time_entry "0" - entrySetText duration_entry "10" entrySetText quality_entry "100" entrySetText width_entry "500" + input_file_button `on` fileChooserButtonFileSet $ do + imageSetFromIconName first_frame_image "gtk-missing-image" IconSizeButton + imageSetFromIconName last_frame_image "gtk-missing-image" IconSizeButton + + start_time_entry `on` editableChanged $ + make_first_frame_preview input_file_button start_time_entry duration_entry first_frame_image last_frame_image + + duration_entry `on` editableChanged $ + make_last_frame_preview input_file_button start_time_entry duration_entry last_frame_image + create_button `on` buttonActivated $ do input_file_text <- fileChooserGetFilename input_file_button input_file_path_name <- case input_file_text of @@ -111,6 +123,8 @@ load_button b = builderGetObject b castToButton +load_image b = builderGetObject b castToImage + build_builder = do builder <- builderNew glade_file <- getDataFileName "data/gui.glade" @@ -132,3 +146,60 @@ open_gif output_file_path_name = spawnCommand $ command ++ output_file_path_name where command = if "linux" `isInfixOf` (fmap toLower System.Info.os) then "xdg-open " else "open " + +reset_image i = imageSetFromIconName i "gtk-missing-image" IconSizeButton + +make_gif_preview ifpn ofpn st btxt = gif [ + ifpn, + ofpn, + st, + "0.001", + "200", + "50", + "", + btxt ] + +make_last_frame_preview ifb ste de lfi = do + forkIO $ + withTempDirectory "." "previews" $ \tmpDir -> do + input_file_text <- fileChooserGetFilename ifb + input_file_path_name <- case input_file_text of + Nothing -> return "" + Just file_path_name -> return file_path_name + start_time_text <- case (return $ entryGetText ste) of + Nothing -> return "" + Just start_time_text -> start_time_text + duration_text <- case (return $ entryGetText de) of + Nothing -> return "" + Just duration_text -> duration_text + if ((not (null input_file_path_name)) && (not (null start_time_text)) && (not (null duration_text))) then do + let output_file_path_name = tmpDir ++ "/end.gif" + let start_time_flt = read start_time_text :: Float + let duration_flt = read duration_text :: Float + let start_time = show $ start_time_flt + duration_flt + result <- make_gif_preview input_file_path_name output_file_path_name start_time " LAST FRAME " + if (result == 0) + then imageSetFromFile lfi output_file_path_name + else reset_image lfi + else reset_image lfi + return () + +make_first_frame_preview ifb ste de ffi lfi = do + forkIO $ do + withTempDirectory "." "previews" $ \tmpDir -> do + input_file_text <- fileChooserGetFilename ifb + input_file_path_name <- case input_file_text of + Nothing -> return "" + Just file_path_name -> return file_path_name + start_time <- case (return $ entryGetText ste) of + Nothing -> return "" + Just start_time -> start_time + if ((not (null input_file_path_name)) && (not (null start_time))) then do + let output_file_path_name = tmpDir ++ "/start.gif" + result <- make_gif_preview input_file_path_name output_file_path_name start_time " FIRST FRAME " + if (result == 0) + then imageSetFromFile ffi output_file_path_name + else reset_image ffi + else reset_image ffi + make_last_frame_preview ifb ste de lfi + return () diff --git a/ui.gif b/ui.gif # file too large to diff: ui.gif