K2HMH/nrsc5-dui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Album Art and Other Tweaks

Browse Source 
Stripped extra artists from the search and save routine to give better search results.
Also moved the automated album art display to be after station cover and logo detection.
Other minor tweaks.
This commit is contained in:
markjfine 2021-04-03 17:19:54 -04:00 committed by GitHub
parent 458cecd278
commit a8109b8f8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nrsc5-dui.py
View File

@ -305,14 +305,14 @@ class NRSC5_DUI(object):
self.imgMap.set_from_pixbuf(self.img_to_pixbuf(map_img)) self.imgMap.set_from_pixbuf(self.img_to_pixbuf(map_img))
else: else:
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR)
self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.LARGE_TOOLBAR) self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.DIALOG)
elif (self.mapData["mapMode"] == 1): elif (self.mapData["mapMode"] == 1):
if os.path.isfile(self.mapData["weatherNow"]): if os.path.isfile(self.mapData["weatherNow"]):
map_img = Image.open(self.mapData["weatherNow"]).resize((img_size, img_size), Image.LANCZOS) map_img = Image.open(self.mapData["weatherNow"]).resize((img_size, img_size), Image.LANCZOS)
self.imgMap.set_from_pixbuf(self.img_to_pixbuf(map_img)) self.imgMap.set_from_pixbuf(self.img_to_pixbuf(map_img))
else: else:
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR)
self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.LARGE_TOOLBAR) self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.DIALOG)
def id3_did_change(self): def id3_did_change(self):
oldTitle = self.txtTitle.get_label() oldTitle = self.txtTitle.get_label()
@ -345,13 +345,22 @@ class NRSC5_DUI(object):
check = 0 check = 0
return check, response, resultUrl, resultArtist return check, response, resultUrl, resultArtist
def fix_artist(self):
newArtist = self.streamInfo["Artist"]
if ("/" in newArtist):
m = re.search(r"/",newArtist)
if (m.start() > -1):
newArtist = newArtist[:m.start()].strip()
return newArtist
def get_cover_image_online(self): def get_cover_image_online(self):
got_cover = False got_cover = False
# only change when there's a new ID3 # only change when there's a new ID3
if (self.id3Changed): if (self.id3Changed):
baseStr = str(self.streamInfo["Artist"]+" - "+self.streamInfo["Title"]).replace("/","_").replace(":","_").replace("and","&") # only care about the first artist listed if separated by slashes
newArtist = self.fix_artist()
baseStr = str(newArtist +" - "+self.streamInfo["Title"]).replace("/","_").replace(":","_")
saveStr = "aas/"+ baseStr.replace(" ","_")+".jpg" saveStr = "aas/"+ baseStr.replace(" ","_")+".jpg"
searchStr = baseStr.replace(" ","+") searchStr = baseStr.replace(" ","+")
@ -372,7 +381,7 @@ class NRSC5_DUI(object):
resultUrl = "" resultUrl = ""
resultArtist = "" resultArtist = ""
check, response, resultUrl, resultArtist = self.get_cover_data(response) check, response, resultUrl, resultArtist = self.get_cover_data(response)
got_cover = (resultArtist.lower() in self.streamInfo["Artist"].lower()) and (check == 0) got_cover = (newArtist.lower() in resultArtist.lower()) and (check == 0)
# if you got a match, save it # if you got a match, save it
if (resultUrl != ""): if (resultUrl != ""):
@ -763,7 +772,7 @@ class NRSC5_DUI(object):
else: else:
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.ICON_SIZE_LARGE_TOOLBAR) # display missing image if file is not found #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.ICON_SIZE_LARGE_TOOLBAR) # display missing image if file is not found
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) # display missing image if file is not found #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) # display missing image if file is not found
self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.LARGE_TOOLBAR) self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.DIALOG)
elif (btn == self.radMapWeather): elif (btn == self.radMapWeather):
self.mapData["mapMode"] = 1 self.mapData["mapMode"] = 1
@ -773,7 +782,7 @@ class NRSC5_DUI(object):
else: else:
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.ICON_SIZE_LARGE_TOOLBAR) # display missing image if file is not found #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.ICON_SIZE_LARGE_TOOLBAR) # display missing image if file is not found
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) # display missing image if file is not found #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) # display missing image if file is not found
self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.LARGE_TOOLBAR) self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.DIALOG)
def on_btnMap_clicked(self, btn): def on_btnMap_clicked(self, btn):
# open map viewer window # open map viewer window
@ -919,9 +928,6 @@ class NRSC5_DUI(object):
# second param is lot id, if -1, show cover, otherwise show cover # second param is lot id, if -1, show cover, otherwise show cover
# technically we should show the file with the matching lot id # technically we should show the file with the matching lot id
if (self.cbCovers.get_active() and self.id3Changed):
self.get_cover_image_online()
#if (int(self.lastXHDR[1]) > 0 and self.streamInfo["Cover"] != None): #if (int(self.lastXHDR[1]) > 0 and self.streamInfo["Cover"] != None):
if self.lastXHDR == "0": if self.lastXHDR == "0":
imagePath = os.path.join(aasDir, self.streamInfo["Cover"]) imagePath = os.path.join(aasDir, self.streamInfo["Cover"])
@ -947,6 +953,10 @@ class NRSC5_DUI(object):
self.imgCover.set_from_pixbuf(self.pixbuf) self.imgCover.set_from_pixbuf(self.pixbuf)
#self.handle_window_resize() #self.handle_window_resize()
self.debugLog("Image Changed") self.debugLog("Image Changed")
if (self.cbCovers.get_active() and self.id3Changed):
self.get_cover_image_online()
finally: finally:
#Gdk.threads_leave() #Gdk.threads_leave()
pass pass
@ -1814,7 +1824,7 @@ class NRSC5_Map(object):
else: else:
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.ICON_SIZE_LARGE_TOOLBAR) # display missing image if file is not found #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.ICON_SIZE_LARGE_TOOLBAR) # display missing image if file is not found
#self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) # display missing image if file is not found #self.imgMap.set_from_stock(Gtk.STOCK_MISSING_IMAGE, Gtk.IconSize.LARGE_TOOLBAR) # display missing image if file is not found
self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.LARGE_TOOLBAR) self.imgMap.set_from_icon_name("MISSING_IMAGE", Gtk.IconSize.DIALOG)
def setMap(self, map): def setMap(self, map):
global mapDir global mapDir