lp:~khaeru/sonata/trunk

Created by Paul Natsuo Kishimoto and last modified
Get this branch:
bzr branch lp:~khaeru/sonata/trunk

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Paul Natsuo Kishimoto
Project:
Sonata
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://git.berlios.de/sonata.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on neumayer and finished taking 25 seconds — see the log
Import started on pear and finished taking 15 seconds — see the log
Import started on pear and finished taking 20 seconds — see the log
Import started on pear and finished taking 15 seconds — see the log

Recent revisions

1278. By Stephen Boyd

Merge branch 'maint-1.6.2'

* maint-1.6.2:
  library: don't list albums with multiple discs multiple times

1277. By Stephen Boyd

Merge branch 'maint-1.6.2'

* maint-1.6.2:
  Fix crashes when files cannot be opened for reading/writing
  setup: remove genversion.pyc too

Conflicts:
 sonata/artwork.py
 sonata/config.py
 sonata/info.py

1276. By Stephen Boyd

Merge branch 'maint-1.6.2'

* maint-1.6.2:
  translations: add Korean translation
  POTFILES: only include files with actual translatable strings
  translations: update TRANSLATORS file and remove messages.po
  setup: generate mo files better
  translations: update Slovak translations
  main: make ctrl-w withdraw app when withdraw app config set
  Fix bad calculation of played song time for audioscrobbling.

1275. By Stephen Boyd

Merge branch 'maint-1.6.2'

Conflicts:
 sonata/artwork.py
 sonata/info.py

1274. By Stephen Boyd

Merge branch 'maint-1.6.2'

* maint-1.6.2:
  main: fix centering of current song in current playlist
  remove website from master
  add a .gitignore
  version: migrate to git version generation
  info: fix some merge issues

Conflicts:
 sonata/cli.py
 sonata/info.py

1273. By Oleg Smirnov <email address hidden>

misc: add support for Chromium browser

1272. By Stephen Boyd

Merge branch 'maint-1.6.2'

Pickup changelog and throw away backported patches
Conflicts:
 CHANGELOG
 sonata/artwork.py
 sonata/info.py
 sonata/main.py

1271. By Stephen Boyd

Merge branch 'sb/rhapsody'

1270. By Stephen Boyd

Merge branch 'th/lyricwiki-scrape'

1269. By Stephen Boyd

info: don't crash when a stream has no tracks

update_album() would cause Sonata to crash when playing a stream with
artist and album metadata. The call to album_return_artist_and_tracks()
would rightly return None and None for the artist and tracks because the
stream is non-local. To avoid this reorganize the checks to make sure
there are tracks to display in the album info. Otherwise just display
"Album info not found." and be done with it.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.