aboutsummaryrefslogtreecommitdiff
path: root/pydora/player.py
diff options
context:
space:
mode:
Diffstat (limited to 'pydora/player.py')
-rw-r--r--pydora/player.py56
1 files changed, 38 insertions, 18 deletions
diff --git a/pydora/player.py b/pydora/player.py
index fdacc63..c4ce2e0 100644
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -132,8 +132,12 @@ class PlayerApp:
132 if song.is_ad: 132 if song.is_ad:
133 print("{} ".format(Colors.cyan("Advertisement"))) 133 print("{} ".format(Colors.cyan("Advertisement")))
134 else: 134 else:
135 print("{} by {}".format(Colors.cyan(song.song_name), 135 print(
136 Colors.yellow(song.artist_name))) 136 "{} by {}".format(
137 Colors.cyan(song.song_name),
138 Colors.yellow(song.artist_name),
139 )
140 )
137 141
138 def skip_song(self, song): 142 def skip_song(self, song):
139 if song.is_ad: 143 if song.is_ad:
@@ -183,13 +187,15 @@ class PlayerApp:
183 self.screen.print_error("Failed to bookmark artis") 187 self.screen.print_error("Failed to bookmark artis")
184 except NotImplementedError: 188 except NotImplementedError:
185 self.screen.print_error( 189 self.screen.print_error(
186 "Cannot bookmark artist for this type of track") 190 "Cannot bookmark artist for this type of track"
191 )
187 192
188 def sleep_song(self, song): 193 def sleep_song(self, song):
189 try: 194 try:
190 if song.sleep(): 195 if song.sleep():
191 self.screen.print_success( 196 self.screen.print_success(
192 "Song will not be played for 30 days") 197 "Song will not be played for 30 days"
198 )
193 self.player.stop() 199 self.player.stop()
194 else: 200 else:
195 self.screen.print_error("Failed to sleep song") 201 self.screen.print_error("Failed to sleep song")
@@ -214,10 +220,14 @@ class PlayerApp:
214 220
215 def help(self, song): 221 def help(self, song):
216 print("") 222 print("")
217 print("\n".join([ 223 print(
218 "\t{:>2} - {}".format(k, v[0]) 224 "\n".join(
219 for k, v in sorted(self.CMD_MAP.items()) 225 [
220 ])) 226 "\t{:>2} - {}".format(k, v[0])
227 for k, v in sorted(self.CMD_MAP.items())
228 ]
229 )
230 )
221 print("") 231 print("")
222 232
223 def input(self, input, song): 233 def input(self, input, song):
@@ -227,7 +237,8 @@ class PlayerApp:
227 cmd = getattr(self, self.CMD_MAP[input][1]) 237 cmd = getattr(self, self.CMD_MAP[input][1])
228 except (IndexError, KeyError): 238 except (IndexError, KeyError):
229 return self.screen.print_error( 239 return self.screen.print_error(
230 "Invalid command {!r}!".format(input)) 240 "Invalid command {!r}!".format(input)
241 )
231 242
232 cmd(song) 243 cmd(song)
233 244
@@ -240,21 +251,30 @@ class PlayerApp:
240 def pre_flight_checks(self): 251 def pre_flight_checks(self):
241 # See #52, this key no longer passes some server-side check 252 # See #52, this key no longer passes some server-side check
242 if self.client.partner_user == "iphone": 253 if self.client.partner_user == "iphone":
243 self.screen.print_error(( 254 self.screen.print_error(
244 "The `iphone` partner key set is no longer compatible with " 255 (
245 "pydora. Please re-run pydora-configure to re-generate " 256 "The `iphone` partner key set is no longer compatible "
246 "your config file before continuing.")) 257 "with pydora. Please re-run pydora-configure to "
258 "re-generate your config file before continuing."
259 )
260 )
247 sys.exit(1) 261 sys.exit(1)
248 262
249 def _parse_args(self): 263 def _parse_args(self):
250 parser = argparse.ArgumentParser( 264 parser = argparse.ArgumentParser(
251 description="command line Pandora player") 265 description="command line Pandora player"
266 )
252 parser.add_argument( 267 parser.add_argument(
253 "--vlc-net", dest="vlc_net", 268 "--vlc-net",
254 help="connect to VLC over the network (host:port)") 269 dest="vlc_net",
270 help="connect to VLC over the network (host:port)",
271 )
255 parser.add_argument( 272 parser.add_argument(
256 "-v", dest="verbose", action="store_true", 273 "-v",
257 help="enable verbose logging") 274 dest="verbose",
275 action="store_true",
276 help="enable verbose logging",
277 )
258 return parser.parse_args() 278 return parser.parse_args()
259 279
260 def run(self): 280 def run(self):