KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2025-10-29 18:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue with Spotify-url and --no-metadata #452 (#454)

Browse Source 
* Applied a check on null result in case of no youtube search

* Allow fetch metadata from spotify upon searching spotify-url and no-metadata

* updated changes.md

* Updated CHANGES.md as per suggestion

* removed unnecessary bool hit

Co-Authored-By: Amit-L <amit.lawanghare@gmail.com>

* removed unnecessary bool hit, anti PEP 8

Co-Authored-By: Amit-L <amit.lawanghare@gmail.com>

* resolved conflicts

* Error shown no videos found

* Dont to show any manual option for no result
This commit is contained in:
Amit Lawanghare
2018-12-29 00:35:24 -08:00
committed by Ritiek Malhotra
parent 51b01fc448
commit 1cf421960c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
### Added ### Added
- Output informative message in case of no result found in YouTube search ([@Amit-L](https://github.com/Amit-L)) (#452)
- Ability to pass multiple tracks with `-s` option ([@ritiek](https://github.com/ritiek)) (#442) - Ability to pass multiple tracks with `-s` option ([@ritiek](https://github.com/ritiek)) (#442)
### Changed ### Changed
- Allowed to fetch metadata from Spotify upon searching Spotify-URL and `--no-metadata` to gather YouTube custom-search fields ([@Amit-L](https://github.com/Amit-L)) (#452)
- Change FFmpeg to use the built-in encoder `aac` instead of 3rd party `libfdk-aac` which does not - Change FFmpeg to use the built-in encoder `aac` instead of 3rd party `libfdk-aac` which does not
ship with the apt package ([@ritiek](https://github.com/ritiek)) (#448) ship with the apt package ([@ritiek](https://github.com/ritiek)) (#448)
- Monkeypatch ever-changing network-relying tests ([@ritiek](https://github.com/ritiek)) (#448) - Monkeypatch ever-changing network-relying tests ([@ritiek](https://github.com/ritiek)) (#448)
@@ -18,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Refactored core downloading module ([@ritiek](https://github.com/ritiek)) (#410) - Refactored core downloading module ([@ritiek](https://github.com/ritiek)) (#410)
### Fixed ### Fixed
- Applied a check on result in case of search using Spotify-URL `--no-metadata` option ([@Amit-L](https://github.com/Amit-L)) (#452)
- Included a missing `import spotipy` in downloader.py ([@ritiek](https://github.com/ritiek)) (#440) - Included a missing `import spotipy` in downloader.py ([@ritiek](https://github.com/ritiek)) (#440)
## [1.1.0] - 2018-11-13 ## [1.1.0] - 2018-11-13

8
spotdl/youtube_tools.py
View File

@@ -50,8 +50,10 @@ def match_video_and_metadata(track, force_pafy=True):
if not const.args.no_metadata: if not const.args.no_metadata:
meta_tags = spotify_tools.generate_metadata(track) meta_tags = spotify_tools.generate_metadata(track)
else: else:
if not const.args.no_metadata: # Let it generate metadata, youtube doesn't know spotify slang
if not const.args.no_metadata or internals.is_spotify(track):
meta_tags = spotify_tools.generate_metadata(track) meta_tags = spotify_tools.generate_metadata(track)
if force_pafy: if force_pafy:
content = go_pafy(track, meta_tags) content = go_pafy(track, meta_tags)
else: else:
@@ -172,6 +174,10 @@ class GenerateYouTubeURL:
) )
def _best_match(self, videos): def _best_match(self, videos):
if not videos:
log.error("No videos found on YouTube for a given search")
return None
""" Select the best matching video from a list of videos. """ """ Select the best matching video from a list of videos. """
if const.args.manual: if const.args.manual:
log.info(self.raw_song) log.info(self.raw_song)