mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-04 22:25:39 +00:00
Use all artists instead of first one
This commit is contained in:
9and3r
150
mopidy_touchscreen/.idea/workspace.xml
generated
150
mopidy_touchscreen/.idea/workspace.xml
generated
@@ -23,55 +23,13 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<file leaf-file-name="screen_manager.py" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/screen_manager.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2814" max-vertical-offset="3240">
|
||||
<caret line="218" column="45" selection-start-line="218" selection-start-column="45" selection-end-line="218" selection-end-column="45" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="playlist_screen.py" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/playlist_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="library_screen.py" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/library_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="37" max-vertical-offset="780">
|
||||
<caret line="40" column="32" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="main_screen.py" pinned="false" current="false" current-in-tab="false">
|
||||
<file leaf-file-name="main_screen.py" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/main_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1537" max-vertical-offset="2325">
|
||||
<caret line="59" column="52" selection-start-line="59" selection-start-column="52" selection-end-line="59" selection-end-column="52" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="menu_screen.py" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/menu_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.6866841" vertical-offset="787" max-vertical-offset="1185">
|
||||
<caret line="70" column="80" selection-start-line="70" selection-start-column="80" selection-end-line="70" selection-end-column="80" />
|
||||
<state vertical-scroll-proportion="6.5384617" vertical-offset="0" max-vertical-offset="2640">
|
||||
<caret line="170" column="0" selection-start-line="170" selection-start-column="0" selection-end-line="170" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -91,9 +49,9 @@
|
||||
<option value="$PROJECT_DIR$/screen_objects.py" />
|
||||
<option value="$PROJECT_DIR$/touch_screen.py" />
|
||||
<option value="$PROJECT_DIR$/library_screen.py" />
|
||||
<option value="$PROJECT_DIR$/main_screen.py" />
|
||||
<option value="$PROJECT_DIR$/screen_manager.py" />
|
||||
<option value="$PROJECT_DIR$/menu_screen.py" />
|
||||
<option value="$PROJECT_DIR$/main_screen.py" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -129,7 +87,6 @@
|
||||
<sortByType />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@@ -150,10 +107,17 @@
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="FullScreen" value="false" />
|
||||
<property name="LayoutCode.rearrangeEntriesPython" value="false" />
|
||||
</component>
|
||||
<component name="PyConsoleOptionsProvider">
|
||||
<option name="myPythonConsoleState">
|
||||
<console-settings />
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="tests" factoryName="py.test">
|
||||
@@ -298,20 +262,20 @@
|
||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34055728" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972136" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24960877" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2543036" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34055728" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32972136" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="Vcs.Log.UiProperties">
|
||||
@@ -334,6 +298,50 @@
|
||||
<breakpoint-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/screen_manager.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3420">
|
||||
<caret line="218" column="45" selection-start-line="218" selection-start-column="45" selection-end-line="218" selection-end-column="45" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/playlist_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/library_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="37" max-vertical-offset="780">
|
||||
<caret line="40" column="32" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/main_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="2490">
|
||||
<caret line="59" column="52" selection-start-line="59" selection-start-column="52" selection-end-line="59" selection-end-column="52" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/menu_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="787" max-vertical-offset="1185">
|
||||
<caret line="70" column="80" selection-start-line="70" selection-start-column="80" selection-end-line="70" selection-end-column="80" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/screen_manager.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="3120">
|
||||
@@ -354,9 +362,7 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="780">
|
||||
<caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
</folding>
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -380,9 +386,7 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="255" max-vertical-offset="450">
|
||||
<caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
</folding>
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -390,7 +394,9 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1695" max-vertical-offset="2340">
|
||||
<caret line="113" column="47" selection-start-line="113" selection-start-column="47" selection-end-line="113" selection-end-column="47" />
|
||||
<folding />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -458,9 +464,7 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="37" max-vertical-offset="780">
|
||||
<caret line="40" column="32" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
</folding>
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -472,14 +476,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/main_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="592" max-vertical-offset="2325">
|
||||
<caret line="59" column="52" selection-start-line="59" selection-start-column="52" selection-end-line="59" selection-end-column="52" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/screen_manager.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2814" max-vertical-offset="3240">
|
||||
@@ -490,10 +486,20 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/menu_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.6866841" vertical-offset="787" max-vertical-offset="1185">
|
||||
<caret line="70" column="80" selection-start-line="70" selection-start-column="80" selection-end-line="70" selection-end-column="80" />
|
||||
<state vertical-scroll-proportion="0.76501304" vertical-offset="532" max-vertical-offset="1185">
|
||||
<caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
<element signature="e#0#31#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/main_screen.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="6.5384617" vertical-offset="0" max-vertical-offset="2640">
|
||||
<caret line="170" column="0" selection-start-line="170" selection-start-column="0" selection-end-line="170" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import pygame
|
||||
import logging
|
||||
import hashlib
|
||||
import time
|
||||
import os
|
||||
@@ -7,7 +5,6 @@ from threading import Thread
|
||||
import urllib
|
||||
import urllib2
|
||||
import json
|
||||
from mopidy.audio import PlaybackState
|
||||
from .touch_manager import TouchManager
|
||||
from .screen_objects import *
|
||||
|
||||
@@ -16,44 +13,48 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class MainScreen():
|
||||
|
||||
def __init__(self, size, manager, cache, core, fonts):
|
||||
self.core = core
|
||||
self.size = size
|
||||
self.base_size = self.size[1]/8
|
||||
self.base_size = self.size[1] / 8
|
||||
self.fonts = fonts
|
||||
self.manager = manager
|
||||
self.track = None
|
||||
self.cache = cache
|
||||
self.image = None
|
||||
self.artists = None
|
||||
self.touch_text_manager = ScreenObjectsManager()
|
||||
|
||||
|
||||
def update(self, screen):
|
||||
if self.track is not None:
|
||||
if self.image is not None:
|
||||
screen.blit(self.image, (self.base_size/2, self.base_size + self.base_size/2))
|
||||
self.touch_text_manager.get_touch_object("time_progress").set_value(self.core.playback.time_position.get()/1000)
|
||||
self.touch_text_manager.get_touch_object("time_progress").set_text(time.strftime('%M:%S', time.gmtime(self.core.playback.time_position.get()/1000))+"/"+time.strftime('%M:%S', time.gmtime(self.track.length/1000)))
|
||||
screen.blit(self.image, (self.base_size / 2, self.base_size + self.base_size / 2))
|
||||
self.touch_text_manager.get_touch_object("time_progress").set_value(self.core.playback.time_position.get() / 1000)
|
||||
self.touch_text_manager.get_touch_object("time_progress").set_text(time.strftime('%M:%S', time.gmtime(self.core.playback.time_position.get() / 1000)) + "/" + time.strftime('%M:%S', time.gmtime(self.track.length / 1000)))
|
||||
self.touch_text_manager.render(screen)
|
||||
return screen
|
||||
|
||||
def track_started(self, track):
|
||||
self.image = None
|
||||
x = self.base_size * 5
|
||||
width = self.size[0]-self.base_size / 2-x
|
||||
width = self.size[0] - self.base_size / 2 - x
|
||||
|
||||
# Load all artists
|
||||
self.artists = []
|
||||
for artist in track.artists:
|
||||
self.artists.append(artist)
|
||||
|
||||
#Track name
|
||||
label = TextItem(self.fonts['base'],track.name,(x,self.base_size*2), (width,self.size[1]))
|
||||
label = TextItem(self.fonts['base'], track.name, (x, self.base_size * 2), (width, self.size[1]))
|
||||
self.touch_text_manager.set_object("track_name", label)
|
||||
|
||||
#Album name
|
||||
label = TextItem(self.fonts['base'],track.album.name,(x,self.base_size*3), (width,self.size[1]))
|
||||
self.touch_text_manager.set_object("album_name",label)
|
||||
label = TextItem(self.fonts['base'], track.album.name, (x, self.base_size * 3), (width, self.size[1]))
|
||||
self.touch_text_manager.set_object("album_name", label)
|
||||
|
||||
#Artist
|
||||
label = TextItem(self.fonts['base'],self.getFirstArtist(track),(x,self.base_size*4), (width,self.size[1]))
|
||||
self.touch_text_manager.set_object("artist_name",label)
|
||||
label = TextItem(self.fonts['base'], self.get_artist_string(), (x, self.base_size * 4), (width, self.size[1]))
|
||||
self.touch_text_manager.set_object("artist_name", label)
|
||||
|
||||
#Previous track button
|
||||
button = TouchAndTextItem(self.fonts['icon'], u"\ue61c", (0, self.base_size * 6), None)
|
||||
@@ -65,67 +66,78 @@ class MainScreen():
|
||||
self.touch_text_manager.set_touch_object("next", button)
|
||||
|
||||
#Progress
|
||||
progress = Progressbar(self.fonts['base'],time.strftime('%M:%S', time.gmtime(0))+"/"+time.strftime('%M:%S', time.gmtime(0)),(size_1, self.base_size*6), (self.size[0] - size_1- size_2,self.base_size),track.length/1000, False)
|
||||
progress = Progressbar(self.fonts['base'],
|
||||
time.strftime('%M:%S', time.gmtime(0)) + "/" + time.strftime('%M:%S', time.gmtime(0)),
|
||||
(size_1, self.base_size * 6), (self.size[0] - size_1 - size_2, self.base_size),
|
||||
track.length / 1000, False)
|
||||
self.touch_text_manager.set_touch_object("time_progress", progress)
|
||||
|
||||
self.track = track
|
||||
if not self.is_image_in_cache():
|
||||
thread = Thread(target=self.downloadImage())
|
||||
thread = Thread(target=self.download_image(0))
|
||||
thread.start()
|
||||
else:
|
||||
self.loadImage()
|
||||
self.load_image()
|
||||
|
||||
def get_artist_string(self):
|
||||
artists_strign = ''
|
||||
for artist in self.artists:
|
||||
artists_strign += artist.name + ', '
|
||||
if len(artists_strign) > 2:
|
||||
artists_strign = artists_strign[:-2]
|
||||
return artists_strign
|
||||
|
||||
def getFirstArtist(self,track):
|
||||
if track is None:
|
||||
artist = next(iter(self.track.artists)).name
|
||||
else:
|
||||
artist = next(iter(track.artists)).name
|
||||
return artist
|
||||
|
||||
|
||||
def getImageFileName(self):
|
||||
name = self.track.album.name + '-' + self.getFirstArtist(None)
|
||||
def get_image_file_name(self):
|
||||
name = self.track.album.name + '-' + self.get_artist_string()
|
||||
md5name = hashlib.md5(name).hexdigest()
|
||||
return md5name
|
||||
|
||||
def getCoverFolder(self):
|
||||
if(not os.path.isdir(self.cache+"/covers")):
|
||||
os.makedirs(self.cache+"/covers")
|
||||
return self.cache+"/covers/"
|
||||
def get_cover_folder(self):
|
||||
if not os.path.isdir(self.cache + "/covers"):
|
||||
os.makedirs(self.cache + "/covers")
|
||||
return self.cache + "/covers/"
|
||||
|
||||
def is_image_in_cache(self):
|
||||
self.getCoverFolder()
|
||||
return os.path.isfile(self.getCoverFolder()+self.getImageFileName())
|
||||
self.get_cover_folder()
|
||||
return os.path.isfile(self.get_cover_folder() + self.get_image_file_name())
|
||||
|
||||
def downloadImage(self):
|
||||
try:
|
||||
safe_artist=urllib.quote_plus(self.getFirstArtist(self.track))
|
||||
safe_album=urllib.quote_plus(self.track.album.name)
|
||||
url="http://ws.audioscrobbler.com/2.0/?"
|
||||
params="method=album.getinfo&api_key=59a04c6a73fb99d6e8996e01db306829&artist="+safe_artist+"&album="+safe_album+"&format=json"
|
||||
response = urllib2.urlopen(url+params)
|
||||
data = json.load(response)
|
||||
image = data['album']['image'][-1]['#text']
|
||||
urllib.urlretrieve(image, self.getCoverFolder()+self.getImageFileName())
|
||||
self.loadImage()
|
||||
except:
|
||||
logger.warning("Cover could not be downloaded")
|
||||
logger.error(self.track.name)
|
||||
width = self.size[0] -self.base_size
|
||||
def download_image(self, artist_index):
|
||||
if artist_index < len(self.artists):
|
||||
try:
|
||||
safe_artist = urllib.quote_plus(self.artists[artist_index].name)
|
||||
safe_album = urllib.quote_plus(self.track.album.name)
|
||||
url = "http://ws.audioscrobbler.com/2.0/?"
|
||||
params = "method=album.getinfo&api_key=59a04c6a73fb99d6e8996e01db306829&artist=" + safe_artist + "&album=" + safe_album + "&format=json"
|
||||
response = urllib2.urlopen(url + params)
|
||||
data = json.load(response)
|
||||
image = data['album']['image'][-1]['#text']
|
||||
urllib.urlretrieve(image, self.get_cover_folder() + self.get_image_file_name())
|
||||
self.load_image()
|
||||
except:
|
||||
self.download_image(artist_index + 1)
|
||||
else:
|
||||
|
||||
current = TextItem(self.fonts['base'],self.track.name,(self.base_size/2,self.base_size*2),(width, self.base_size))
|
||||
logger.info("Cover could not be downloaded")
|
||||
|
||||
# There is no cover so it will use all the screen size for the text
|
||||
width = self.size[0] - self.base_size
|
||||
|
||||
current = TextItem(self.fonts['base'], self.track.name, (self.base_size / 2, self.base_size * 2),
|
||||
(width, self.base_size))
|
||||
self.touch_text_manager.set_object("track_name", current)
|
||||
|
||||
current = TextItem(self.fonts['base'],self.track.album.name,(self.base_size/2,self.base_size*3),(width, self.base_size))
|
||||
current = TextItem(self.fonts['base'], self.track.album.name, (self.base_size / 2, self.base_size * 3),
|
||||
(width, self.base_size))
|
||||
self.touch_text_manager.set_object("album_name", current)
|
||||
|
||||
current = TextItem(self.fonts['base'],self.getFirstArtist(self.track),(self.base_size/2,self.base_size*4),(width, self.base_size))
|
||||
current = TextItem(self.fonts['base'], self.get_artist_string(), (self.base_size / 2, self.base_size * 4),
|
||||
(width, self.base_size))
|
||||
self.touch_text_manager.set_object("artist_name", current)
|
||||
|
||||
def loadImage(self):
|
||||
def load_image(self):
|
||||
size = self.base_size * 4
|
||||
self.image = pygame.transform.scale(pygame.image.load(self.getCoverFolder()+self.getImageFileName()).convert(),(size,size))
|
||||
self.image = pygame.transform.scale(
|
||||
pygame.image.load(self.get_cover_folder() + self.get_image_file_name()).convert(), (size, size))
|
||||
|
||||
def touch_event(self, event):
|
||||
if event.type == TouchManager.click:
|
||||
@@ -148,13 +160,11 @@ class MainScreen():
|
||||
volume = self.core.playback.volume.get() + 10
|
||||
if volume > 100:
|
||||
volume = 100
|
||||
self.manager.backend.tell({'action':'volume','value':volume})
|
||||
self.manager.backend.tell({'action': 'volume', 'value': volume})
|
||||
self.manager.volume_changed(volume)
|
||||
elif event.direction == TouchManager.down:
|
||||
volume = self.core.playback.volume.get() - 10
|
||||
if volume < 0:
|
||||
volume = 0
|
||||
self.manager.backend.tell({'action':'volume','value':volume})
|
||||
self.manager.backend.tell({'action': 'volume', 'value': volume})
|
||||
self.manager.volume_changed(volume)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user