Merge pull request #2 from pyscioffice/bug_fix

Fix convert bug

README.md

@@ -32,5 +32,9 @@ pymov2gif test.mov --resolution=800x600 --framerate=10 --output_filename=test.gi
 ## Installation 
 Both the python interface and the command line interface require `pymov2gif` to be installed via `pip`:
 ```
-pip install git+https://github.com/pyscioffice/mov2gif.git
+pip install pymov2gif
 ```
+Alternatively, `pymov2gif` can be installed using conda-forge:
+```
+conda -c conda-forge pymov2gif
+```

pymov2gif/__init__.py

@@ -1 +1,28 @@
-from pymov2gif import convert
+import os
+import subprocess
+
+
+def convert(file, resolution="800x600", framerate=10, output_file=None):
+    """
+    Convert *.mov files to *.gif format
+
+    Args:
+        file (str): Input movie file in *.mov format
+        resolution (str): Resolution of the output *.gif file - default: 800x600
+        framerate (int): Framerate of the output *.gif file - default: 10
+        output_file (str/None): Filename of the output *.gif file - optional
+    """
+    file = os.path.abspath(os.path.expanduser(file))
+    if output_file is None:
+        output_file = os.path.splitext(os.path.basename(file))[0] + ".gif"
+    command_options = (
+        "ffmpeg -i "
+        + file
+        + " -s "
+        + resolution
+        + " -pix_fmt rgb24 -r "
+        + str(framerate)
+        + " -f gif - | gifsicle --optimize=3 --delay=3 > "
+        + output_file
+    )
+    subprocess.check_output(command_options, shell=True, universal_newlines=True)

pymov2gif/__main__.py

@@ -2,7 +2,7 @@
 Convert *.mov files to *.gif format
 """
 import argparse
-from pymov2gif.convert import convert
+from pymov2gif import convert
 
 
 def command_line_parser():