mirror/khinsider
1
0
Fork 0
mirror of https://github.com/obskyr/khinsider.git synced 2025-01-17 20:48:46 +01:00
Code Issues Projects Releases Wiki Activity

Fixed downloading images and updated variable names.

Browse Source 
Fixes #15.
This commit is contained in:
obskyr 2017-11-20 05:41:43 +01:00
parent c0eda1c0b6
commit 06ccccc0dc
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
khinsider.py
View File

@ -155,8 +155,6 @@ def getImageInfo(soup):
for a in soup('p')[1]('a'): for a in soup('p')[1]('a'):
url = a['href'] url = a['href']
name = url.rsplit('/', 1)[1] name = url.rsplit('/', 1)[1]
# The names start with numbers that aren't really part of the filename.
name = name.split('-', 1)[1]
info = [name, url] info = [name, url]
images.append(info) images.append(info)
return images return images
@ -189,33 +187,33 @@ def download(ostName, path=".", makeDirs=True, verbose=False):
"""Download an OST with the ID `ostName` to `path`.""" """Download an OST with the ID `ostName` to `path`."""
if verbose: if verbose:
print("Getting song list...") print("Getting song list...")
songInfos = getFileList(ostName) fileInfos = getFileList(ostName)
totalSongs = len(songInfos) totalFiles = len(fileInfos)
if makeDirs and not os.path.isdir(path): if makeDirs and not os.path.isdir(path):
os.makedirs(os.path.abspath(os.path.realpath(path))) os.makedirs(os.path.abspath(os.path.realpath(path)))
for songNumber, (name, url) in enumerate(songInfos): for fileNumber, (name, url) in enumerate(fileInfos):
if not os.path.isfile(os.path.join(path, name)): if not os.path.isfile(os.path.join(path, name)):
downloadSong(url, path, name, verbose=verbose, downloadFile(url, path, name, verbose=verbose,
songNumber=songNumber + 1, totalSongs=totalSongs) fileNumber=fileNumber + 1, totalFiles=totalFiles)
else: else:
if verbose: if verbose:
numberStr = "{}/{}: ".format( numberStr = "{}/{}: ".format(
str(songNumber + 1).zfill(len(str(totalSongs))), str(fileNumber + 1).zfill(len(str(totalFiles))),
str(totalSongs) str(totalFiles)
) )
print("Skipping over {}{}. Already exists.".format( print("Skipping over {}{}. Already exists.".format(
numberStr, name)) numberStr, name))
def downloadSong(songUrl, path, name="song", numTries=3, verbose=False, def downloadFile(fileUrl, path, name="song", numTries=3, verbose=False,
songNumber=None, totalSongs=None): fileNumber=None, totalFiles=None):
"""Download a single song at `songUrl` to `path`.""" """Download a single file at `fileUrl` to `path`."""
if verbose: if verbose:
numberStr = "" numberStr = ""
if songNumber is not None and totalSongs is not None: if fileNumber is not None and totalFiles is not None:
numberStr = "{}/{}: ".format( numberStr = "{}/{}: ".format(
str(songNumber).zfill(len(str(totalSongs))), str(fileNumber).zfill(len(str(totalFiles))),
str(totalSongs) str(totalFiles)
) )
print("Downloading {}{}...".format(numberStr, name)) print("Downloading {}{}...".format(numberStr, name))
@ -224,7 +222,7 @@ def downloadSong(songUrl, path, name="song", numTries=3, verbose=False,
try: try:
if tries and verbose: if tries and verbose:
print("Couldn't download {}. Trying again...".format(name)) print("Couldn't download {}. Trying again...".format(name))
song = requests.get(songUrl) response = requests.get(fileUrl)
break break
except requests.ConnectionError: except requests.ConnectionError:
tries += 1 tries += 1
@ -235,7 +233,7 @@ def downloadSong(songUrl, path, name="song", numTries=3, verbose=False,
try: try:
with open(os.path.join(path, name), 'wb') as outfile: with open(os.path.join(path, name), 'wb') as outfile:
outfile.write(song.content) outfile.write(response.content)
except IOError: except IOError:
if verbose: if verbose:
print("Couldn't save {}. Please check your permissions.".format(name)) print("Couldn't save {}. Please check your permissions.".format(name))
@ -290,5 +288,13 @@ if __name__ == '__main__':
print("Make sure you have a working internet connection.") print("Make sure you have a working internet connection.")
except KeyboardInterrupt: except KeyboardInterrupt:
print("Stopped download.") print("Stopped download.")
except Exception as e:
print()
print("An unexpected error occurred! "
"If it isn't too much to ask, please report to "
"https://github.com/obskyr/khinsider.")
print("Attach the following error message:")
print()
raise e
doIt() doIt()