Commit 5c2e94aa authored by Rob Nelson's avatar Rob Nelson
Browse files

Merge branch 'master' of git.nexisonline.net:N3X15/ss13-media-converter

parents 4b8f179e 4ca9bbac
/files-upl
/tmp_files
#/source
/source
*.pyc
grabmusic.sh
......@@ -5,7 +5,11 @@ MIT license
REQUIRES:
sudo apt-get install -y sox libsox-fmt-all libav-tools
<<<<<<< HEAD
sudo -H pip install mutagen pyyaml
=======
pip install mutagen pyyaml
>>>>>>> 4ca9bbac8ccbf336b22c6d79b6929187fa8a9339
'''
import glob
import hashlib
......@@ -25,6 +29,11 @@ from functools import reduce
sys.path.append('lib/ryetalin')
import ryetalin
<<<<<<< HEAD
=======
OUTPUT_DIR=os.path.abspath(u'files-upl')
OUTPUT_EXT=u'mp3' # WAS MP3
>>>>>>> 4ca9bbac8ccbf336b22c6d79b6929187fa8a9339
OUTPUT_DIR = os.path.abspath(u'files-upl')
OUTPUT_EXT = u'mp3' # WAS MP3
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment