lukas
/
deemix-py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed --local and added --portable

This commit is contained in:
RemixDev 2020-09-03 16:13:57 +02:00
parent 01dc66dadd
commit e0fcdaedbb
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
deemix/__main__.py
View File

@ -2,25 +2,32 @@
import click import click
from deemix.app.cli import cli from deemix.app.cli import cli
from os.path import isfile import os.path
@click.command() @click.command()
@click.option('--portable', is_flag=True, help='Creates the config folder in the same directory where the script is launched')
@click.option('-b', '--bitrate', default=None, help='Overwrites the default bitrate selected') @click.option('-b', '--bitrate', default=None, help='Overwrites the default bitrate selected')
@click.option('-l', '--local', is_flag=True, help='Downloads in a local folder insted of using the default')
@click.option('-p', '--path', type=str, help='Downloads in the given folder') @click.option('-p', '--path', type=str, help='Downloads in the given folder')
@click.argument('url', nargs=-1, required=True) @click.argument('url', nargs=-1, required=True)
def download(bitrate, local, url, path): def download(url, bitrate, portable, path):
app = cli(local, path) localpath = os.path.realpath('.')
configFolder = None
if portable:
configFolder = os.path.join(localpath, 'config')
if path is not None:
if path == '': path = '.'
path = os.path.realpath(path)
app = cli(path, configFolder)
app.login() app.login()
url = list(url) url = list(url)
if isfile(url[0]): if os.path.isfile(url[0]):
filename = url[0] filename = url[0]
with open(filename) as f: with open(filename) as f:
url = f.readlines() url = f.readlines()
app.downloadLink(url, bitrate) app.downloadLink(url, bitrate)
click.echo("All done!") click.echo("All done!")
if local:
click.echo(app.set.settings['downloadLocation']) #folder name output
if __name__ == '__main__': if __name__ == '__main__':
download() download()

16
deemix/app/cli.py
View File

@ -1,24 +1,16 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import os.path as path import os.path as path
import string from os import makedirs
import random
from os import mkdir
from deemix.app import deemix from deemix.app import deemix
def randomString(stringLength=8):
letters = string.ascii_lowercase
return ''.join(random.choice(letters) for i in range(stringLength))
class cli(deemix): class cli(deemix):
def __init__(self, local, path, configFolder=None): def __init__(self, path, configFolder=None):
super().__init__(configFolder) super().__init__(configFolder)
if path: if path:
self.set.settings['downloadLocation'] = str(path) self.set.settings['downloadLocation'] = str(path)
makedirs(path, exist_ok=True)
print("Using folder: "+self.set.settings['downloadLocation']) print("Using folder: "+self.set.settings['downloadLocation'])
if local:
self.set.settings['downloadLocation'] = randomString(12)
print("Using a local download folder: "+self.set.settings['downloadLocation'])
def downloadLink(self, url, bitrate=None): def downloadLink(self, url, bitrate=None):
for link in url: for link in url:
@ -38,7 +30,7 @@ class cli(deemix):
def login(self): def login(self):
configFolder = self.set.configFolder configFolder = self.set.configFolder
if not path.isdir(configFolder): if not path.isdir(configFolder):
mkdir(configFolder) makedirs(configFolder, exist_ok=True)
if path.isfile(path.join(configFolder, '.arl')): if path.isfile(path.join(configFolder, '.arl')):
with open(path.join(configFolder, '.arl'), 'r') as f: with open(path.join(configFolder, '.arl'), 'r') as f:
arl = f.readline().rstrip("\n") arl = f.readline().rstrip("\n")