mirrors/irs
1
1
Fork 0
mirror of https://github.com/cooperhammond/irs.git synced 2025-01-02 19:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Fixed merge logic error

Browse source
This commit is contained in:
Kepoor Hampond 2017-03-15 20:50:37 -07:00
parent 4a1d34db0b
commit df86541d62
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
irs/utils.py
View file

@ -297,9 +297,13 @@ def check_sources(ripper, key, default=None, environment=False, where=None):
#============ #============
from .config import CONFIG from .config import CONFIG
def check_sources(ripper, key, default=None, environment=False): def check_sources(ripper, key, default=None, environment=False, where=None):
if ripper.args.get(key): tmp_args = ripper.args
return ripper.args.get(key) if where != None and ripper.args.get(where):
tmp_args = ripper.args.get(where)
if tmp_args.get(key):
return tmp_args.get(key)
elif CONFIG.get(key): elif CONFIG.get(key):
return CONFIG.get(key) return CONFIG.get(key)
elif os.environ.get(key) and environment == True: elif os.environ.get(key) and environment == True:

2
setup.py
View file

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name='irs', name='irs',
version='6.1.2', version='6.2.2',
description='A music downloader that just gets metadata.', description='A music downloader that just gets metadata.',
url='https://github.com/kepoorhampond/irs', url='https://github.com/kepoorhampond/irs',
author='Kepoor Hampond', author='Kepoor Hampond',