Updates to version 3.0.0.1

CHANGELOG.md

@@ -4,6 +4,28 @@
 
 -------------------------------------------------------------------------------
 
+### 3.0.0.1
+
+#### Added
+
+- Added project website under docs
+
+#### Changed
+
+- Changed docs to haddock
+- Increased base optimization with fuzz and map
+- Increased default frame rate to 15
+- Set tighter bounds on number of colors
+- Set tighter bounds on quality percent clamp
+- Query stream for duration and then container for duration
+- Fixed empty file name issue
+
+#### Removed
+
+-
+
+-------------------------------------------------------------------------------
+
 ### 3.0.0.0
 
 #### Added

Gifcurry.cabal

@@ -1,5 +1,5 @@
 name:                 Gifcurry
-version:              3.0.0.0
+version:              3.0.0.1
 synopsis:             GIF creation utility.
 description:          Your open source video to GIF maker.
 homepage:             https://github.com/lettier/gifcurry

README.md

@@ -28,7 +28,7 @@ Is Gifcurry another Electron app? No way! Gifcurry is 100% #electronfree.
 No need to download more RAM, Gifcurry is light as a feather.
 Run it all day, run it all year—you'll never notice.
 
-I know what your're thinkin', "Gifcurry is just FFMpeg and ImageMagick," but you'd be wrong.
+I know what you're thinkin', "Gifcurry is just FFMpeg and ImageMagick," but you'd be wrong.
 Gifcurry hides all the goofy details so you can concentrate on what matters—the almighty GIF.
 Making GIFs with Gifcurry is fun so try it out!
 
@@ -111,7 +111,7 @@ gifcurry_cli \
          `'╙╙╙╙'``                                                             
 
 
-Gifcurry 3.0.0.0
+Gifcurry 3.0.0.1
 (C) 2016 David Lettier
 lettier.com
 
@@ -163,23 +163,23 @@ To find the latest version of Gifcurry, head over to the
 ### I use Linux.
 
 If you use Linux then the easiest way to grab a copy of Gifcurry is by downloading the
-[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage).
+[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage).
 After you download the
-[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage),
+[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage),
 right click on it, select permissions, and check the box near execute.
 With that out of the way—you're all set—just double click on the AppImage
 and the GUI will fire right up.
 
 You can also download and install the
-[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage)
+[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage)
 using the handy
 [AppImage install script](https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/linux/app-image/gifcurry-app-image-install.sh)
 (right click and save link as).
 Download the script, right click on it, select permissions, check the box near execute, and double click on it.
 You should now see Gifcurry listed alongside your other installed programs.
 
 If you want the CLI then download the
-[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-linux-3.0.0.0.tar.gz)
+[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-linux-3.0.0.1.tar.gz)
 for Linux, extract it, open up your terminal,
 `cd` to the bin folder, and then run `gifcurry_cli -?`.
 As an added bonus, inside the bin directory is the GUI version
@@ -228,7 +228,7 @@ The
 [Gifcurry snap](https://snapcraft.io/gifcurry)
 only comes with the GUI.
 If you want the CLI, download the
-[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-linux-3.0.0.0.tar.gz)
+[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-linux-3.0.0.1.tar.gz)
 for Linux.
 
 ### I use Mac.

docs/index.html

@@ -146,8 +146,8 @@ <h2 class="">
               <a href="https://www.imagemagick.org/script/download.php">ImageMagick</a>.
             <p>
               Linux users can download the
-              <a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage">AppImage</a> or
-              the <a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-linux-3.0.0.0.tar.gz">prebuilt binaries</a>.
+              <a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage">AppImage</a> or
+              the <a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-linux-3.0.0.1.tar.gz">prebuilt binaries</a>.
               If you'd rather install it, you can do so via
               <a href="https://aur.archlinux.org/packages/gifcurry/">pacman</a> (Arch)
               or

makefile

@@ -9,14 +9,20 @@ STACK_GHC_EXE=`$(STACK) path --compiler-exe`
 STACK_GHC_BIN=`$(STACK) path --compiler-bin`
 STACK_PATHS=$(STACK_PATH_LOCAL_BIN):$(STACK_GHC_BIN)
 CABAL=env PATH=$(PATH):$(STACK_PATHS) $(STACK_PATH_LOCAL_BIN)/cabal
-VERSION='3.0.0.0'
+CABAL_SANDBOX_DIR=".cabal-sandbox"
+_APPLICATIONS_DESKTOP_DIR="$(CABAL_SANDBOX_DIR)/share/applications"
+_ICONS_HICOLOR_SCALABLE_APPS_DIR="$(CABAL_SANDBOX_DIR)/share/icons/hicolor/scalable/apps"
+_PACKAGING_LINUX_COMMON_DIR="./packaging/linux/common"
+VERSION='3.0.0.1'
 
 export PATH := $(PATH):$(STACK_PATH_LOCAL_BIN)
 
-all: setup update sandbox_clean clean alex happy haskell_gi gtk2hs_buildtools install_dependencies configure build install
+all: setup update sandbox_clean clean alex happy haskell_gi gtk2hs_buildtools install_dependencies configure build cabal_install
 
 setup:
-  $(STACK) setup && $(STACK) update && $(STACK) install Cabal && $(STACK) install cabal-install
+  $(STACK) setup && $(STACK) update && \
+  $(STACK) install Cabal && \
+  $(STACK) install cabal-install
 
 alex: setup
   $(STACK) install alex
@@ -51,41 +57,34 @@ install_dependencies: sandbox
 configure: sandbox
   $(CABAL) --require-sandbox configure -w $(STACK_GHC_EXE)
 
+applications_desktop: sandbox
+  mkdir -p $(_APPLICATIONS_DESKTOP_DIR) && \
+  cp $(_PACKAGING_LINUX_COMMON_DIR)/gifcurry.desktop $(_APPLICATIONS_DESKTOP_DIR)/
+
+icons_hicolor_scalable_apps: applications_desktop
+  mkdir -p $(_ICONS_HICOLOR_SCALABLE_APPS_DIR) && \
+  cp $(_PACKAGING_LINUX_COMMON_DIR)/gifcurry-icon.svg $(_ICONS_HICOLOR_SCALABLE_APPS_DIR)/
+
 build: configure
   $(CABAL) --require-sandbox build -j
 
-install: build
+cabal_install: applications_desktop icons_hicolor_scalable_apps build
   $(CABAL) --require-sandbox install -j -w $(STACK_GHC_EXE) --enable-relocatable
 
 release: check build
   $(CABAL) sdist
 
-run_gui: install
+run_gui: cabal_install
   ./.cabal-sandbox/bin/gifcurry_gui
 
-run_cli: install
+run_cli: cabal_install
   ./.cabal-sandbox/bin/gifcurry_cli $(CLI_ARGS)
 
 build_docs: setup
   $(CABAL) haddock --hyperlink-source \
   --html-location='http://hackage.haskell.org/package/Gifcurry/docs' \
   --contents-location='http://hackage.haskell.org/package/Gifcurry' && \
+  mkdir -p ./haddock && \
   cp -R ./dist/doc/html/Gifcurry/ ./haddock/Gifcurry-$(VERSION)-docs && \
   cd ./haddock && \
   tar --format=ustar -cvf ./Gifcurry-$(VERSION)-docs.tar Gifcurry-$(VERSION)-docs
-
-# Begin Arch Linux Specific
-arch_os_build_gifcurry: setup update clean sandbox_clean alex happy haskell_gi gtk2hs_buildtools arch_os_install_dependencies arch_os_configure arch_os_build
-
-arch_os_install_dependencies: sandbox
-  $(CABAL) --require-sandbox install -j -w $(STACK_GHC_EXE) --force-reinstalls --reinstall --only-dependencies
-
-arch_os_configure: sandbox
-  $(CABAL) --require-sandbox configure -w $(STACK_GHC_EXE) --prefix=$(PREFIX)
-
-arch_os_build: arch_os_configure
-  $(CABAL) --require-sandbox build -j
-
-arch_os_install_gifcurry: arch_os_build
-  $(CABAL) --require-sandbox copy --destdir=$(DESTDIR)
-# End Arch Linux Specific

packaging/linux/app-image/gifcurry-app-image-install.sh

@@ -3,7 +3,7 @@
 # (C) 2017 David Lettier
 # lettier.com
 
-GIFCURRY_VERSION="3.0.0.0"
+GIFCURRY_VERSION="3.0.0.1"
 GIFCURRY_RELEASES_DOWNLOAD="https://github.com/lettier/gifcurry/releases/download/$GIFCURRY_VERSION"
 GIFCURRY_PACKAGING_LINUX_COMMON="https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/linux/common"
 GIFCURRY_APP_IMAGE="gifcurry-$GIFCURRY_VERSION-x86_64.AppImage"

packaging/linux/arch-aur/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Lettier <gifcurry_aur a@@at@t lettier dd.ot..t ccommm>
 
 _name=gifcurry
-_ver=3.0.0.0
+_ver=3.0.0.1
 _xrev=0
 
 pkgname=${_name}

packaging/linux/snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: gifcurry
-version: '3.0.0.0'
+version: '3.0.0.1'
 summary: Your open source video to GIF maker.
 type: app
 description: |

src/data/gui.glade

@@ -1224,7 +1224,7 @@ Author: David Lettier
     <property name="transient_for">gifcurry-window</property>
     <property name="attached_to">gifcurry-window</property>
     <property name="program_name">Gifcurry</property>
-    <property name="version">3.0.0.0</property>
+    <property name="version">3.0.0.1</property>
     <property name="copyright" translatable="yes">(C) 2016 David Lettier
 lettier.com</property>
     <property name="website">https://github.com/lettier/gifcurry</property>

src/gui/Main.hs

@@ -237,6 +237,7 @@ handleInputFileChoice
       Gifcurry.getVideoDurationInSeconds
         Gifcurry.defaultGifParams
           { Gifcurry.inputFile = inFilePath }
+    print maybeVideoDuration
     maybeWidthHeight <-
       Gifcurry.getVideoWidthAndHeight
         Gifcurry.defaultGifParams
@@ -712,7 +713,7 @@ outFileChooserButtonGetFilePath :: GI.Gtk.FileChooserButton -> GI.Gtk.Entry -> I
 outFileChooserButtonGetFilePath outFileChooserButton outFileNameEntry = do
   filePath <- fileChooserButtonGetString outFileChooserButton
   fileName <- Data.Text.unpack . Data.Text.strip <$> GI.Gtk.entryGetText outFileNameEntry
-  if Data.List.null filePath
+  if Data.List.null filePath || Data.List.null fileName
     then return fileName
     else do
       isDirectory <- System.Directory.doesDirectoryExist filePath