mirrors/irs
1
1
Fork 0
mirror of https://github.com/cooperhammond/irs.git synced 2024-09-19 22:45:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed getting stuck in an infinite loop while searching for yt link

Browse source
This commit is contained in:
kepoorhampond 2017-10-13 23:03:32 -07:00
parent 6e915b8937
commit 727368fdd1
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
irs/ripper.py
View file

@ -174,7 +174,7 @@ init, or in method arguments.")
results = list(filter(None, map(find_link, soup.find_all("a")))) results = list(filter(None, map(find_link, soup.find_all("a"))))
garbage_phrases = "cover album live clean rare version full full \ garbage_phrases = "cover album live clean rare version full full \
album row at @ session".split(" ") album row at @ session how to npr music reimagined hr version".split(" ")
self.code = None self.code = None
counter = 0 counter = 0
@ -182,12 +182,15 @@ album row at @ session".split(" ")
while self.code is None and counter <= 10: while self.code is None and counter <= 10:
counter += 1 counter += 1
for link in results: for link in results:
if first == True: if first == True and tries >= 10:
self.code = link self.code = link
break break
if ObjManip.check_garbage_phrases(garbage_phrases, if ObjManip.check_garbage_phrases(garbage_phrases,
link["title"], song): link["title"], song):
continue continue
if first == True:
self.code = link
break
if ObjManip.blank_include(link["title"], song) and \ if ObjManip.blank_include(link["title"], song) and \
ObjManip.blank_include(link["title"], artist): ObjManip.blank_include(link["title"], artist):
self.code = link self.code = link
@ -217,7 +220,9 @@ album row at @ session".split(" ")
song = ObjManip.limit_song_name(song) song = ObjManip.limit_song_name(song)
if self.code is None and first is not True: if self.code is None and first is not True:
if additional_search == "lyrics": if tries >= 5:
return self.find_yt_url(song, artist, additional_search, caught_by_google, first=True, tries=tries + 1)
elif additional_search == "lyrics":
return self.find_yt_url(song, artist, additional_search, caught_by_google, first, tries=tries + 1) return self.find_yt_url(song, artist, additional_search, caught_by_google, first, tries=tries + 1)
try: try: