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

More minor tweaks

Browse Source 
More cleanup and bugfixes.
This commit is contained in:
markjfine 2021-04-05 09:26:11 -04:00 committed by GitHub
parent a8109b8f8d
commit b225ca9ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nrsc5-dui.py
View File

@ -292,10 +292,11 @@ class NRSC5_DUI(object):
def on_cover_resize(self, container): def on_cover_resize(self, container):
global mapDir global mapDir
if self.coverImage != "": if self.coverImage != "":
img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12 #img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12
pixbuf = GdkPixbuf.Pixbuf.new_from_file(self.coverImage) #pixbuf = GdkPixbuf.Pixbuf.new_from_file(self.coverImage)
pixbuf = pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR) #pixbuf = pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR)
self.imgCover.set_from_pixbuf(pixbuf) #self.imgCover.set_from_pixbuf(pixbuf)
self.showArtwork(self.coverImage)
img_size = min(self.alignmentMap.get_allocated_height(), self.alignmentMap.get_allocated_width()) - 12 img_size = min(self.alignmentMap.get_allocated_height(), self.alignmentMap.get_allocated_width()) - 12
if (self.mapData["mapMode"] == 0): if (self.mapData["mapMode"] == 0):
@ -361,7 +362,8 @@ class NRSC5_DUI(object):
# only care about the first artist listed if separated by slashes # only care about the first artist listed if separated by slashes
newArtist = self.fix_artist() newArtist = self.fix_artist()
baseStr = str(newArtist +" - "+self.streamInfo["Title"]).replace("/","_").replace(":","_") baseStr = str(newArtist +" - "+self.streamInfo["Title"]).replace("/","_").replace(":","_")
saveStr = "aas/"+ baseStr.replace(" ","_")+".jpg" #saveStr = "aas/"+ baseStr.replace(" ","_")+".jpg"
saveStr = os.path.join(aasDir, baseStr.replace(" ","_")+".jpg")
searchStr = baseStr.replace(" ","+") searchStr = baseStr.replace(" ","+")
# does it already exist? # does it already exist?
@ -392,13 +394,19 @@ class NRSC5_DUI(object):
# If no match use the station logo if there is one # If no match use the station logo if there is one
else: else:
self.coverImage = self.stationLogos[self.stationStr][self.streamNum] self.coverImage = os.path.join(aasDir, self.stationLogos[self.stationStr][self.streamNum])
except: except:
pass pass
# now display it by simulating a window resize # now display it by simulating a window resize
self.on_cover_resize(self.mainWindow) self.on_cover_resize(self.mainWindow)
def showArtwork(self, art):
img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12
self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(art)
self.pixbuf = self.pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR)
self.imgCover.set_from_pixbuf(self.pixbuf)
def displayLogo(self): def displayLogo(self):
global aasDir global aasDir
#if (self.stationLogos.has_key(self.stationStr)): #if (self.stationLogos.has_key(self.stationStr)):
@ -407,13 +415,14 @@ class NRSC5_DUI(object):
logo = os.path.join(aasDir, self.stationLogos[self.stationStr][self.streamNum]) logo = os.path.join(aasDir, self.stationLogos[self.stationStr][self.streamNum])
if (os.path.isfile(logo)): if (os.path.isfile(logo)):
self.streamInfo["Logo"] = self.stationLogos[self.stationStr][self.streamNum] self.streamInfo["Logo"] = self.stationLogos[self.stationStr][self.streamNum]
img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12 #img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12
#self.pixbuf = Gtk.gdk.pixbuf_new_from_file(logo) #self.pixbuf = Gtk.gdk.pixbuf_new_from_file(logo)
self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(logo) #self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(logo)
self.coverImage = logo self.coverImage = logo
#self.handle_window_resize() #self.handle_window_resize()
self.pixbuf = self.pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR) #self.pixbuf = self.pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR)
self.imgCover.set_from_pixbuf(self.pixbuf) #self.imgCover.set_from_pixbuf(self.pixbuf)
self.showArtwork(logo)
else: else:
# add entry in database for the station if it doesn't exist # add entry in database for the station if it doesn't exist
self.stationLogos[self.stationStr] = ["", "", "", ""] self.stationLogos[self.stationStr] = ["", "", "", ""]
@ -441,7 +450,6 @@ class NRSC5_DUI(object):
def on_window_resized(self,window): def on_window_resized(self,window):
self.handle_window_resize() self.handle_window_resize()
def on_btnPlay_clicked(self, btn): def on_btnPlay_clicked(self, btn):
global aasDir global aasDir
# start playback # start playback
@ -945,12 +953,13 @@ class NRSC5_DUI(object):
if (self.lastImage != image) and os.path.isfile(imagePath): if (self.lastImage != image) and os.path.isfile(imagePath):
self.xhdrChanged = False self.xhdrChanged = False
self.lastImage = image self.lastImage = image
img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12 #img_size = min(self.alignmentCover.get_allocated_height(), self.alignmentCover.get_allocated_width()) - 12
#self.pixbuf = Gtk.gdk.pixbuf_new_from_file(imagePath) #self.pixbuf = Gtk.gdk.pixbuf_new_from_file(imagePath)
self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(imagePath) #self.pixbuf = GdkPixbuf.Pixbuf.new_from_file(imagePath)
self.coverImage = imagePath self.coverImage = imagePath
self.pixbuf = self.pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR) #self.pixbuf = self.pixbuf.scale_simple(img_size, img_size, GdkPixbuf.InterpType.BILINEAR)
self.imgCover.set_from_pixbuf(self.pixbuf) #self.imgCover.set_from_pixbuf(self.pixbuf)
self.showArtwork(imagePath)
#self.handle_window_resize() #self.handle_window_resize()
self.debugLog("Image Changed") self.debugLog("Image Changed")