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

Fixed downloading songs with Unicode names.

Browse Source 
Once and for all, hopefully!
This commit is contained in:
obskyr 2015-10-12 16:04:17 +02:00
parent 8687d91388
commit 7e07691b3b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
khinsider.py
View File

@ -132,20 +132,23 @@ def download(ostName, path="", verbose=False):
def downloadSong(songUrl, path, name="song", numTries=3, verbose=False): def downloadSong(songUrl, path, name="song", numTries=3, verbose=False):
"""Download a single song at `songUrl` to `path`.""" """Download a single song at `songUrl` to `path`."""
if verbose: if verbose:
print("Downloading {}...".format(name)) print("Downloading {}...".format(name).encode(
sys.stdout.encoding, 'replace'))
tries = 0 tries = 0
while tries < numTries: while tries < numTries:
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).encode(sys.stdout.encoding, 'replace'))
song = requests.get(songUrl) song = requests.get(songUrl)
break break
except requests.ConnectionError: except requests.ConnectionError:
tries += 1 tries += 1
else: else:
if verbose: if verbose:
print("Couldn't download {}. Skipping over.".format(name)) print("Couldn't download {}. Skipping over.".format(
name).encode(sys.stdout.encoding, 'replace'))
return return
try: try:
@ -153,7 +156,8 @@ def downloadSong(songUrl, path, name="song", numTries=3, verbose=False):
outfile.write(song.content) outfile.write(song.content)
except IOError: except IOError:
if verbose: if verbose:
print("Couldn't save {}. Check your permissions.".format(name)) print("Couldn't save {}. Check your permissions.".format(
name).encode(sys.stdout.encoding, 'replace'))
def search(term): def search(term):
"""Return a list of OST IDs for the search term `term`.""" """Return a list of OST IDs for the search term `term`."""
@ -197,7 +201,10 @@ if __name__ == '__main__':
searchTerm = ' '.join(sys.argv[1:]).replace('-', ' ') searchTerm = ' '.join(sys.argv[1:]).replace('-', ' ')
searchResults = search(searchTerm) searchResults = search(searchTerm)
print("\nThe soundtrack \"{}\" does not seem to exist.".format(ostName)) # I don't know, maybe in some crazy circumstance the encoding for
# arguments doesn't match stdout's encoding.
print("\nThe soundtrack \"{}\" does not seem to exist.".format(
ostName).encode(sys.stdout.encoding, 'replace'))
if searchResults: # aww yeah we gon' do some searchin' if searchResults: # aww yeah we gon' do some searchin'
print() print()