Merge lp:~rockstar/entertainer/package-structure-apocalypse into lp:entertainer/future

[Paul Hummer]

Entertainer's package structure has been re-organized

[Paul Hummer (rockstar)]

This branch is the apocalyptical package structure changes. entertainerlib.backend will disappear as soon as the new indexer lands. There are all sorts of changes here. The only real code change was the complete removal of entertainerlib.utils.cd_utils, because there was a single line single function, which I easily removed. Otherwise, I consolidated a lot of packages into single modules, and flattened the tree a bunch.

This specifically needs to land in future, because it's unnecessary when there is still a backend/frontend. Frontend was renamed to client, and will become more of a client in later branches. entertainerlib.utils was removed, and its contents shifted around.

This is probably going to cause a lot of conflicts, which is another big reason why this needs to land in future. The future branch is there solely to be liberal in the changes that need to be made, and, well, these changes are quite liberal. Tests, lint, and running entertainer all indicate everything is good, but the jury is still out, and will require A LOT of changes.

[Samuel Buffet (samuel-buffet)]

Hi Paul,

Good to see Entertainer becoming a client/server application.

I have some points to discuss with you before I go on deeper in the review. Most of them are related with the tree structure you've chosen.

Under entertainerlib we have :

backend
client
db
glade
gui
network
test

My questions are.

Why db isn't under backend? and why gui is not under client?

I think it's more readable and more logic because gui which contains widgets/screens ... are all used only by the *client* and *db* is used by the server (I guess).

You write that you're about to remove entertainerlib.backend but I don't understand right now why you don't rename it in entertainerlib.server? Does that mean that the server's code will take place elsewhere?

That's the first set of questions I have taking a first look to this branch.

Samuel-

Note :

Entertainer is broken if the notification icon is activated. See below the traceback :

(/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainer:31123): libglade-WARNING **: could not find glade file '/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/gui/glade/system_tray_icon_menu.glade'
Traceback (most recent call last):
  File "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainer", line 12, in <module>
    main()
  File "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/client/__init__.py", line 33, in main
    client_client = Client()
  File "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/client/client.py", line 51, in __init__
    self.quit_client, self.toggle_interface_visibility)
  File "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/gui/system_tray_icon.py", line 42, in __init__
    os.path.join(self.GLADE_DIR, "system_tray_icon_menu.glade"))
RuntimeError: could not create GladeXML object

[Matt Layman (mblayman)]

> Why db isn't under backend? and why gui is not under client?
>
> I think it's more readable and more logic because gui which contains
> widgets/screens ... are all used only by the *client* and *db* is used by the
> server (I guess).

I can't speak for db, but moving gui out of frontend was my request. I know that the frontend is currently the only thing that uses the gui module, but there is no true reason that gui needs to be a sub-module of frontend (it could theoretically be totally independent of the frontend). Moving gui out of frontend flattens the depth of the tree which I think is a good thing here. I have a feeling Paul would say the same thing about the db and the backend.

> Note :
> Entertainer is broken if the notification icon is activated. See below the
> traceback :

I agree that this needs to be fixed before the branch lands.

[Matt Layman (mblayman)]

Paul,

Here are all my comments that I recorded as I went through the diff:

What was the rationale behind putting all the dialog classes into a single file? I would suggest that we at least call it dialogs if there are going to be multiple, but it doesn't make too much sense to me to put them all in the same file, especially if our dialogs might only grow more capabilities over time (like TV stuff).

entertainerlib/backend/core/message_type_priority.py
 * FRONTEND_OPENED and FRONTEND_CLOSED should probably change to CLIENT_*. The comments with those lines don't make sense because frontend was substituted with client.

entertainerlib/client/__init__.py
 * Initial comment isn't valid.
 * client_client is weird.

entertainerlib/client/client.py
 * import order
 * class doc string has Frontend
 * logger name isn't correct, would client.Client

entertainerlib/client/media_player.py
 * import order

entertainerlib/client/medialibrary/music.py
 * import order

entertainerlib/client/medialibrary/videos.py
 * import order

entertainerlib/dialog.py
 * import order

entertainerlib/gui/screens/artist.py
 * import order

entertainerlib/gui/screens/disc.py
 * import order

entertainerlib/gui/screens/feed.py
 * import order

entertainerlib/gui/screens/feed_entry.py
 * import order

entertainerlib/gui/screens/main.py
 * import order

entertainerlib/gui/screens/music.py
 * import order

entertainerlib/gui/screens/rss.py
 * import order

entertainerlib/gui/system_tray_icon.py
 * Switch from frontend to client revealed some code that must is broken. set_client_visible has no implementation.

entertainerlib/gui/transitions/factory.py
 * import order

entertainerlib/gui/transitions/slide.py
 * import order

entertainerlib/gui/user_interface.py
 * import order
 * Uses UserEvent.QUIT_FRONTEND. That event should change to QUIT_CLIENT.

entertainerlib/gui/widgets/image_menu.py
 * import order

entertainerlib/gui/widgets/list_indicator.py
 * import order

entertainerlib/gui/widgets/tab_group.py
 * import order

entertainerlib/gui/widgets/text_menu.py
 * import order

entertainerlib/gui/widgets/texture.py
 * logger name doesn't need to refer to client anymore

entertainerlib/tests/test_logger.py
 * import order

entertainerlib/tests/test_theme.py
 * import order

entertainerlib/thumbnailer.py
 * import order

entertainerlib/utils/cd_utils.py
 * Removed, so you can link to bug 313815

setup.py
 * There is no longer a client/glade directory so 'client/glade/*' shouldn't be needed anymore.

[Paul Hummer (rockstar)]

On Thu, 07 May 2009 19:59:33 -0000, Samuel Buffet <email address hidden>
> My questions are.
>
> Why db isn't under backend? and why gui is not under client?

db is a core part of entertainer. I tried to make thinngs more easily
accessible, and once I get the network stuff in, it won't be used by just one
package.

> You write that you're about to remove entertainerlib.backend but I don't
> understand right now why you don't rename it in entertainerlib.server? Does
> that mean that the server's code will take place elsewhere?

Because there won't be just one entertainer server. There will be with 0.5,
but the end goal is to provide more options. I figure something like
entertainerlib.network.local.Server and entertainerlib.network.dlna.Server,
etc.

Now you'll see why db didn't stay in the backend.

Also, most of the backend code is pure crap now, being replaced, and will be
completely removed. THAT's why I didn't move it to a new location. :)

>> Note :
>
> Entertainer is broken if the notification icon is activated. See below the
> traceback :
>
> (/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainer:31123):
> libglade-WARNING **: could not find glade file
> '/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/gui/glade/system_tray_icon_menu.glade'
> Traceback (most recent call last): File
> "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainer",
> line 12, in <module> main() File
> "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/client/__init__.py",
> line 33, in main client_client = Client() File
> "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/client/client.py",
> line 51, in __init__ self.quit_client, self.toggle_interface_visibility)
> File
> "/mnt/raid/Programmes/branches_entertainer/package-structure-apocalypse/entertainerlib/gui/system_tray_icon.py",
> line 42, in __init__ os.path.join(self.GLADE_DIR,
> "system_tray_icon_menu.glade")) RuntimeError: could not create GladeXML
> object
>

I don't know yet what to with the system tray icon. No one uses it, it
doesn't really fit in with what Entertainer is (a media center, not a desktop
application) and I currently don't have any plans to support it in the local
server.

--
Paul Hummer
http://theironlion.net
1024/862FF08F C921 E962 58F8 5547 6723 0E8C 1C4D 8AC5 862F F08F

[Paul Hummer (rockstar)]

> What was the rationale behind putting all the dialog classes into a single
> file? I would suggest that we at least call it dialogs if there are going
> to be multiple, but it doesn't make too much sense to me to put them all in
> the same file, especially if our dialogs might only grow more capabilities
> over time (like TV stuff).

They depend on similar things. As I was working on everything else, it only
made sense to consolidate those dialogs. I think the next logical step would
be to create an EntertainerDialog, and extend the dialogs that way. That code
is an utter mess. I think, for the time being, it should stay as the same
module, and get it cleaned up. If (and this is a big IF) we see a need to make
a package out of this, we can be confident that the code is being maintained.

> entertainerlib/backend/core/message_type_priority.py
> * FRONTEND_OPENED and FRONTEND_CLOSED should probably change to CLIENT_*.
> The comments with those lines don't make sense because frontend was
> substituted with client.

Nope, I'm not touching that message passing crap. It never worked right, and
will just get deleted when the server is implemented.

>
> entertainerlib/client/__init__.py
> * Initial comment isn't valid.
> * client_client is weird.

Yeah, I thought that too. client.client_client vs client.client, either way,
it's a bit repetitive. I was going to see if you wanted to root around in the
client code and see what you'd need.

>
> entertainerlib/client/client.py
> * import order
> * class doc string has Frontend
> * logger name isn't correct, would client.Client

I've made the changes to everything but import order. The import order will be
re-arranged before this lands in trunk, but the imports are going to be hell to
merge from trunk as it is. I'd rather do a second branch with the import order
stuff. This is the beauty of having this HIGHLY experimental branch. I think
this is an acceptable solution.

> entertainerlib/gui/system_tray_icon.py
> * Switch from frontend to client revealed some code that must is broken.
> set_client_visible has no implementation.

I don't plan on fixing this in this branch. If it's broken, it's broken. It
may not even be in the next version of Entertainer.

> entertainerlib/gui/user_interface.py
> * import order
> * Uses UserEvent.QUIT_FRONTEND. That event should change to QUIT_CLIENT.

I changed this to just QUIT. These events are only used by the client anyway,
so QUIT_CLIENT is rather redundant.

> entertainerlib/gui/widgets/texture.py
> * logger name doesn't need to refer to client anymore

Fixed.

> entertainerlib/utils/cd_utils.py
> * Removed, so you can link to bug 313815

Sweet, thanks. I figured there was a bug, but I was too lazy to go find it.
:)

>
> setup.py
> * There is no longer a client/glade directory so 'client/glade/*'
> shouldn't be needed anymore.

Fixed.

Here's the incremental diff:

=== modified file 'entertainerlib/client/__init__.py'
--- entertainerlib/client/__init__.py 2009-05-05 04:43:57 +0000
+++ entertainerlib/client/__init__.py 2009-05-09 03:14:44 +0000
@@ -1,8 +1,8 @@
-'''Frontend gui to entertainer'''
+'''Client code for Entertainer.'''
 # py...

[lp:~rockstar/entertainer/package-structure-apocalypse]

382. By Paul Hummer on 2009-05-09

Responded to Matt's review

[Samuel Buffet (samuel-buffet)]

Hi Paul,

I'm going to approve this branch as I can see on it the seeds of Entertainer's future.

> Also, most of the backend code is pure crap now, being replaced, and will be
> completely removed. THAT's why I didn't move it to a new location. :)

Okay, with those explanations.

> I don't know yet what to with the system tray icon. No one uses it, it
> doesn't really fit in with what Entertainer is (a media center, not a desktop
> application) and I currently don't have any plans to support it in the local
> server.

Well, I do use it. Also, I think this is not good at all to have *broken* code.
So it turns out to me that either we have to fix this or we remove all the code
related to this notification icon. But, as we're not really sure of the future of
this feature and as fixing this should be rather trivial, I'd prefer the fix
solution.

> They depend on similar things. As I was working on everything else, it only
> made sense to consolidate those dialogs. I think the next logical step would
> be to create an EntertainerDialog, and extend the dialogs that way. That code
> is an utter mess. I think, for the time being, it should stay as the same
> module, and get it cleaned up. If (and this is a big IF) we see a need to
> make
> a package out of this, we can be confident that the code is being maintained.

I'm not sure it's a good idea. I tempted to say "+1 with Matt".
Even if the *one Class per file* rule is nonsense sometime but here ...??

>=== added file 'entertainerlib/download.py'
>--- entertainerlib/download.py 1970-01-01 00:00:00 +0000
>+++ entertainerlib/download.py 2009-05-07 19:37:31 +0000
>@@ -0,0 +1,453 @@
>+'''Downloader classes.'''
>+
>+__licence__ = "GPLv2"
>+__copyright__ = "2009 Entertainer Developers"
>+

I like the idea to group our downloaders. What about weather downloader? Is it
planned in the future?

> self.window.connect('destroy', self.destroy_callback)
>@@ -53,7 +53,7 @@
> except gobject.GError:
> # Must not be installed from a package, get icon from the branch
> file_dir = os.path.dirname(__file__)
>- icon_path = os.path.join(file_dir, '..', '..', '..', 'icons',
>+ icon_path = os.path.join(file_dir, '..', '..', 'icons',
> 'hicolor', '48x48', 'apps', 'entertainer.png')
> icon = gtk.gdk.pixbuf_new_from_file(icon_path)
> self.window.set_icon(icon)

(just me thinking loudly) => If we want to improve our flexibility with folder
tree modifications, we have to find a way to avoid those '..', '..'.
What about adding more xxx_dir (root_dir, data_dir, etc). Those could be calculated
attributes of our config object.

Thanks for the great work Paul. Entertainer will rock with the future client/server
architecture and a robust and powerfull indexer.

Samuel-

[Matt Layman (mblayman)]

After looking over the conversations in this thread, I've concluded that I have to think differently about my normal standards and realize that this isn't trunk. I do wonder how we can capture the problems that start to arise as we merge branches onto future. Some problems will go away when future gets closer to merging into trunk, but what if we just forget about some of these things and merge them onto trunk by accident. That's my one reservation about approving this branch.

However, I do like the bulk of this work and since it is such a disruptive change, I would rather it land sooner than later. Therefore, I'm going to approve in spite of my concerns.

review: Approve

[Samuel Buffet (samuel-buffet)]

Go Paul! Go!

This is really something we need and like Matt said, this is not trunk. So you have a STRONG approval from me on this work. I can add that I'm very happy with the goal of this branch.

Cheers,
Samuel-

review: Approve

[lp:~rockstar/entertainer/package-structure-apocalypse]

383. By Paul Hummer on 2009-05-10

Merged from entertainer-future

384. By Paul Hummer on 2009-05-10

Added copyright stuff to the new files

=== modified file 'entertainer'
--- entertainer	2008-10-25 16:41:22 +0000
+++ entertainer	2009-05-06 03:37:34 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-'''Main frontend executable'''
+'''Main client executable'''
 
 __licence__ = "GPLv2"
 __copyright__ = "2007, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 __version__ = "0.2"
 
-from entertainerlib.frontend import main
+from entertainerlib.client import main
 
 if __name__ == '__main__':
     main()

=== modified file 'entertainer-client'
--- entertainer-client	2009-04-04 05:30:04 +0000
+++ entertainer-client	2009-05-06 03:37:34 +0000
@@ -2,7 +2,7 @@
 '''Test client for Entertainer's server.
 
 This code will go away when the client code is integrated into what is now the
-frontend.
+client.
 '''
 
 from entertainerlib.network import client_main

=== modified file 'entertainer-content-manager'
--- entertainer-content-manager	2008-12-19 04:06:18 +0000
+++ entertainer-content-manager	2009-05-06 03:37:34 +0000
@@ -3,11 +3,10 @@
 
 import gtk
 
-from entertainerlib.frontend.translation_setup import TranslationSetup
+from entertainerlib.client.translation_setup import TranslationSetup
 TranslationSetup()
 
-from entertainerlib.utils.content_management_dialog import (
-    ContentManagementDialog)
+from entertainerlib.dialog import ContentManagementDialog
 
 
 ContentManagementDialog(True)

=== modified file 'entertainer-preferences'
--- entertainer-preferences	2008-12-19 04:06:18 +0000
+++ entertainer-preferences	2009-05-06 03:37:34 +0000
@@ -3,10 +3,10 @@
 
 import gtk
 
-from entertainerlib.frontend.translation_setup import TranslationSetup
+from entertainerlib.client.translation_setup import TranslationSetup
 TranslationSetup()
 
-from entertainerlib.utils.preferences_dialog import PreferencesDialog
+from entertainerlib.dialog import PreferencesDialog
 
 
 PreferencesDialog(True)

=== modified file 'entertainerlib/backend/backend_server.py'
--- entertainerlib/backend/backend_server.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/backend/backend_server.py	2009-05-05 04:43:57 +0000
@@ -8,8 +8,8 @@
 
 import gobject
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 # Entertainer backend core
 from entertainerlib.backend.core.message import Message

=== modified file 'entertainerlib/backend/components/feeds/feed_fetcher.py'
--- entertainerlib/backend/components/feeds/feed_fetcher.py	2009-02-07 21:43:35 +0000
+++ entertainerlib/backend/components/feeds/feed_fetcher.py	2009-05-05 04:43:57 +0000
@@ -10,8 +10,8 @@
 from datetime import datetime
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 # Messaging system
 from entertainerlib.backend.core.message import Message

=== modified file 'entertainerlib/backend/components/feeds/feed_manager.py'
--- entertainerlib/backend/components/feeds/feed_manager.py	2008-08-15 23:52:30 +0000
+++ entertainerlib/backend/components/feeds/feed_manager.py	2009-05-05 04:43:57 +0000
@@ -8,8 +8,8 @@
 from pysqlite2 import dbapi2 as sqlite
 from entertainerlib.backend.components.feeds.feed_fetcher import FeedFetcher
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 # Messaging system
 from entertainerlib.backend.core.message_type_priority import MessageType

=== renamed file 'entertainerlib/utils/feed_utils.py' => 'entertainerlib/backend/components/feeds/feed_utils.py'
--- entertainerlib/utils/feed_utils.py	2009-02-08 07:43:25 +0000
+++ entertainerlib/backend/components/feeds/feed_utils.py	2009-05-06 04:00:53 +0000
@@ -11,7 +11,7 @@
 import gtk
 import gtk.glade
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 
 class FeedEntryParser:

=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
--- entertainerlib/backend/components/mediacache/image_cache.py	2009-02-19 14:30:24 +0000
+++ entertainerlib/backend/components/mediacache/image_cache.py	2009-05-05 04:43:57 +0000
@@ -11,8 +11,8 @@
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.thumbnailer import ImageThumbnailer
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 from entertainerlib.backend.components.mediacache.cache import Cache
 

=== modified file 'entertainerlib/backend/components/mediacache/media_cache_manager.py'
--- entertainerlib/backend/components/mediacache/media_cache_manager.py	2009-01-06 23:51:38 +0000
+++ entertainerlib/backend/components/mediacache/media_cache_manager.py	2009-05-05 04:43:57 +0000
@@ -4,8 +4,8 @@
 __copyright__ = "2007, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 from entertainerlib.backend.core.message_type_priority import MessageType
 from entertainerlib.backend.core.message_handler import MessageHandler
@@ -16,7 +16,7 @@
 from entertainerlib.backend.components.mediacache.video_cache import VideoCache
 
 class MediaCacheManager(MessageHandler):
-    """Makes sure that frontend has all the data available."""
+    """Makes sure that client has all the data available."""
 
     def __init__(self):
         """

=== modified file 'entertainerlib/backend/components/mediacache/music_cache.py'
--- entertainerlib/backend/components/mediacache/music_cache.py	2009-04-24 20:41:49 +0000
+++ entertainerlib/backend/components/mediacache/music_cache.py	2009-05-06 04:46:51 +0000
@@ -12,11 +12,11 @@
 import ogg.vorbis
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.albumart_downloader import AlbumArtDownloader
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
-
 from entertainerlib.backend.components.mediacache.cache import Cache
+from entertainerlib.configuration import Configuration
+from entertainerlib.download import AlbumArtDownloader
+from entertainerlib.logger import Logger
+
 
 class MusicCache(Cache):
     """

=== modified file 'entertainerlib/backend/components/mediacache/video_cache.py'
--- entertainerlib/backend/components/mediacache/video_cache.py	2009-02-19 14:30:24 +0000
+++ entertainerlib/backend/components/mediacache/video_cache.py	2009-05-05 04:43:57 +0000
@@ -9,8 +9,8 @@
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.thumbnailer import VideoThumbnailer
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 from entertainerlib.backend.components.mediacache.cache import Cache
 from entertainerlib.backend.components.mediacache.video_metadata_search import (

=== modified file 'entertainerlib/backend/components/mediacache/video_metadata_search.py'
--- entertainerlib/backend/components/mediacache/video_metadata_search.py	2009-02-07 22:12:25 +0000
+++ entertainerlib/backend/components/mediacache/video_metadata_search.py	2009-05-05 04:24:32 +0000
@@ -12,8 +12,8 @@
 import threading
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.logger import Logger
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.logger import Logger
+from entertainerlib.configuration import Configuration
 
 class VideoMetadataSearch(threading.Thread):
     """

=== modified file 'entertainerlib/backend/core/client_connection.py'
--- entertainerlib/backend/core/client_connection.py	2009-02-07 21:43:35 +0000
+++ entertainerlib/backend/core/client_connection.py	2009-05-05 04:24:32 +0000
@@ -11,7 +11,7 @@
 # Messaging system
 from entertainerlib.backend.core.message_handler import MessageHandler
 
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 class ClientConnection(threading.Thread, MessageHandler):
     """

=== modified file 'entertainerlib/backend/core/connection_server.py'
--- entertainerlib/backend/core/connection_server.py	2009-02-06 08:13:48 +0000
+++ entertainerlib/backend/core/connection_server.py	2009-05-05 04:24:32 +0000
@@ -10,7 +10,7 @@
 
 from entertainerlib.backend.core.client_connection import ClientConnection
 
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 class ConnectionServer(threading.Thread):
     """

=== modified file 'entertainerlib/backend/core/message_bus.py'
--- entertainerlib/backend/core/message_bus.py	2009-02-06 08:13:48 +0000
+++ entertainerlib/backend/core/message_bus.py	2009-05-05 04:24:32 +0000
@@ -5,7 +5,7 @@
 from entertainerlib.backend.core.message import Message
 from entertainerlib.backend.core.message_handler import MessageHandler
 from entertainerlib.backend.core.message_type_priority import MessageType
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 __licence__ = "GPLv2"
 __copyright__ = "2007, Lauri Taimila"

=== modified file 'entertainerlib/backend/core/message_bus_proxy.py'
--- entertainerlib/backend/core/message_bus_proxy.py	2009-01-05 03:25:03 +0000
+++ entertainerlib/backend/core/message_bus_proxy.py	2009-05-05 04:11:48 +0000
@@ -9,7 +9,7 @@
 import threading
 from cStringIO import StringIO
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class MessageBusProxy(threading.Thread):
     """

=== modified file 'entertainerlib/backend/core/message_type_priority.py'
--- entertainerlib/backend/core/message_type_priority.py	2009-01-31 15:46:36 +0000
+++ entertainerlib/backend/core/message_type_priority.py	2009-04-30 01:11:22 +0000
@@ -33,10 +33,10 @@
     # Indicates that Content Management UI has been used to update contents.
     CONTENT_CONF_UPDATED = 1
 
-    # Indicates that frontend has been opened.
+    # Indicates that client has been opened.
     FRONTEND_OPENED = 2
 
-    # Indicates that frontend has been closed.
+    # Indicates that client has been closed.
     FRONTEND_CLOSED = 3
 
     # Indicates that Feed cache has been updated.

=== renamed directory 'entertainerlib/frontend' => 'entertainerlib/client'
=== modified file 'entertainerlib/client/__init__.py'
--- entertainerlib/frontend/__init__.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/client/__init__.py	2009-05-05 04:43:57 +0000
@@ -5,7 +5,7 @@
     '''Frontend runner'''
 
     # Import statements are inside the function so that they aren't imported
-    # every time something from the frontend is imported
+    # every time something from the client is imported
 
     # cluttergtk must be imported before the first import of clutter so it
     # must be imported even though pylint complains about it not being used.
@@ -14,12 +14,12 @@
     import gobject
     import gtk
 
-    from entertainerlib.frontend.translation_setup import TranslationSetup
+    from entertainerlib.client.translation_setup import TranslationSetup
     TranslationSetup()
 
     from entertainerlib.backend.backend_server import BackendServer
-    from entertainerlib.utils.configuration import Configuration
-    from entertainerlib.frontend.frontend_client import FrontendClient
+    from entertainerlib.configuration import Configuration
+    from entertainerlib.client.client import Client
 
     gobject.threads_init()
     gtk.gdk.threads_init()
@@ -30,7 +30,7 @@
         print "Entertainer backend starting..."
         BackendServer()
 
-    frontend_client = FrontendClient()
-    frontend_client.start()
+    client_client = Client()
+    client_client.start()
 
 

=== renamed file 'entertainerlib/frontend/frontend_client.py' => 'entertainerlib/client/client.py'
--- entertainerlib/frontend/frontend_client.py	2009-02-10 00:59:03 +0000
+++ entertainerlib/client/client.py	2009-05-05 04:43:57 +0000
@@ -9,34 +9,34 @@
 
 import gtk
 
-from entertainerlib.frontend.backend_connection import BackendConnection
-from entertainerlib.frontend.gui.user_interface import UserInterface
-from entertainerlib.frontend.medialibrary.feeds import FeedLibrary
-from entertainerlib.frontend.medialibrary.music import MusicLibrary
-from entertainerlib.frontend.medialibrary.images import ImageLibrary
-from entertainerlib.frontend.medialibrary.videos import VideoLibrary
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
-from entertainerlib.utils.system_tray_icon import SystemTrayIcon
+from entertainerlib.client.backend_connection import BackendConnection
+from entertainerlib.gui.user_interface import UserInterface
+from entertainerlib.client.medialibrary.feeds import FeedLibrary
+from entertainerlib.client.medialibrary.music import MusicLibrary
+from entertainerlib.client.medialibrary.images import ImageLibrary
+from entertainerlib.client.medialibrary.videos import VideoLibrary
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
+from entertainerlib.gui.system_tray_icon import SystemTrayIcon
 
-class FrontendClient:
+class Client:
     '''
-    Entertainer frontend
+    Entertainer client
 
-    This is a frontend application of the Entertainer. Frontend is a GUI part
-    that user sees on the screen. This class is a core of the frontend. Frontend
+    This is a client application of the Entertainer. Frontend is a GUI part
+    that user sees on the screen. This class is a core of the client. Frontend
     connects to the backend's messagebus at startup.
     '''
 
     def __init__(self):
         '''
-        Create a new frontend.
+        Create a new client.
 
-        This initializes all frontend stuff like media librarys, remote
+        This initializes all client stuff like media librarys, remote
         control receiver and GUI. After this we just wait user actions.
         '''
         config = Configuration()
-        self.logger = Logger().getLogger('frontend.FrontendClient')
+        self.logger = Logger().getLogger('client.FrontendClient')
         self.backend_connection = self.initialize_backend_connection()
         feed_library = FeedLibrary(self.backend_connection)
         music_library = MusicLibrary(self.backend_connection)
@@ -44,11 +44,11 @@
         video_library = VideoLibrary(self.backend_connection)
         self.ui = UserInterface(
             feed_library, image_library, music_library, video_library,
-            self.quit_frontend)
+            self.quit_client)
 
         if config.tray_icon_enabled():
             SystemTrayIcon(
-                self.quit_frontend, self.toggle_interface_visibility)
+                self.quit_client, self.toggle_interface_visibility)
 
     def start(self):
         '''Start the necessary main loop.'''
@@ -65,8 +65,8 @@
 
         return backend_connection
 
-    def quit_frontend(self):
-        '''Clean up the connection to the backend then close the frontend.'''
+    def quit_client(self):
+        '''Clean up the connection to the backend then close the client.'''
         self.backend_connection.close_connection()
 
         gtk.main_quit()

=== modified file 'entertainerlib/client/media_player.py'
--- entertainerlib/frontend/media_player.py	2009-02-08 08:44:46 +0000
+++ entertainerlib/client/media_player.py	2009-05-05 04:24:32 +0000
@@ -11,9 +11,9 @@
 import clutter
 import gst
 
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.medialibrary.playable import Playable
-from entertainerlib.utils.logger import Logger
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.client.medialibrary.playable import Playable
+from entertainerlib.logger import Logger
 
 class MediaPlayer(object):
     """
@@ -59,7 +59,7 @@
         self.repeat = False              # Repeat mode
         self.playing = False             # Is media player currently playing
 
-        self.logger = Logger().getLogger('frontend.MediaPlayer')
+        self.logger = Logger().getLogger('client.MediaPlayer')
 
         self.video_texture = cluttergst.VideoTexture()
         self.playbin = self.video_texture.get_playbin()

=== modified file 'entertainerlib/client/medialibrary/feeds.py'
--- entertainerlib/frontend/medialibrary/feeds.py	2009-01-26 18:28:26 +0000
+++ entertainerlib/client/medialibrary/feeds.py	2009-05-05 04:11:48 +0000
@@ -7,7 +7,7 @@
 
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class FeedLibrary(object):
     """

=== modified file 'entertainerlib/client/medialibrary/images.py'
--- entertainerlib/frontend/medialibrary/images.py	2009-01-31 17:57:51 +0000
+++ entertainerlib/client/medialibrary/images.py	2009-05-05 04:11:48 +0000
@@ -7,7 +7,7 @@
 import os
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class ImageLibrary:
     """

=== modified file 'entertainerlib/client/medialibrary/music.py'
--- entertainerlib/frontend/medialibrary/music.py	2009-03-15 16:01:39 +0000
+++ entertainerlib/client/medialibrary/music.py	2009-05-06 04:46:51 +0000
@@ -8,10 +8,10 @@
 import CDDB, DiscID
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
-from entertainerlib.frontend.medialibrary.playable import Playable
-from entertainerlib.utils.lyrics_downloader import LyricsDownloader
+from entertainerlib.client.medialibrary.playable import Playable
+from entertainerlib.download import LyricsDownloader
 
 
 class MusicLibraryException(Exception):

=== modified file 'entertainerlib/client/medialibrary/videos.py'
--- entertainerlib/frontend/medialibrary/videos.py	2009-02-01 19:15:02 +0000
+++ entertainerlib/client/medialibrary/videos.py	2009-05-05 04:24:32 +0000
@@ -8,10 +8,10 @@
 import os
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
-from entertainerlib.frontend.medialibrary.playable import Playable
+from entertainerlib.client.medialibrary.playable import Playable
 
 class VideoLibrary:
     """
@@ -137,7 +137,7 @@
 
         #Setting default values
         self.logger = Logger().getLogger(
-            'frontend.medialibrary.videos.VideoItem')
+            'client.medialibrary.videos.VideoItem')
         self.__title = ""
         self.__filename = ""
         self.__length = 0

=== renamed file 'entertainerlib/utils/configuration.py' => 'entertainerlib/configuration.py'
--- entertainerlib/utils/configuration.py	2009-03-08 21:29:32 +0000
+++ entertainerlib/configuration.py	2009-05-06 05:37:53 +0000
@@ -14,10 +14,10 @@
 from entertainerlib.backend.core.message_type_priority import MessageType
 from entertainerlib.backend.core.message_handler import MessageHandler
 
-from entertainerlib.utils.theme import Theme
+from entertainerlib.gui.theme import Theme
 
 SOURCE_CONFIG = {
-    'branch' : os.path.abspath(os.path.dirname(__file__) + '/../../cfg'),
+    'branch' : os.path.abspath(os.path.dirname(__file__) + '/../cfg'),
     # Hardcoded path for a package install
     'package' : "/usr/share/entertainer/cfg"
     }
@@ -332,9 +332,9 @@
             location = ''
         return location
 
-    def display_weather_in_frontend(self):
+    def display_weather_in_client(self):
         """
-        Should we display weather in frontend
+        Should we display weather in client
         @return: Boolean
         """
         try:
@@ -344,9 +344,9 @@
             return False
         return result
 
-    def display_cd_eject_in_frontend(self):
+    def display_cd_eject_in_client(self):
         """
-        Should we display the cd eject button in frontend
+        Should we display the cd eject button in client
         @return: Boolean
         @author: Joshua Scotton
         """

=== renamed directory 'entertainerlib/backend/core/db' => 'entertainerlib/db'
=== added file 'entertainerlib/dialog.py'
--- entertainerlib/dialog.py	1970-01-01 00:00:00 +0000
+++ entertainerlib/dialog.py	2009-05-06 05:10:14 +0000
@@ -0,0 +1,1374 @@
+'''Dialogs for Entertainer.'''
+# pylint: disable-msg=C0302
+
+__licence__ = "GPLv2"
+__copyright__ = '2009 Entertainer Developers, 2008 Joshua Scotton'
+
+import os
+import shutil
+import socket
+import sys
+import tarfile
+
+import gtk
+import gtk.glade
+
+from entertainerlib.backend.core.message import Message
+from entertainerlib.backend.core.message_bus_proxy import MessageBusProxy
+from entertainerlib.backend.core.message_type_priority import MessageType
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
+from entertainerlib.gui.theme import Theme
+from entertainerlib.backend.components.feeds.feed_utils import (OPMLParser,
+    FeedConfigTools)
+from entertainerlib.weather import Weather
+
+
+class ContentManagementDialog:
+    """
+    This is a content management tool for Entertainer media center application.
+    """
+
+    # Temporary storage for entered URL
+    url = ""
+    GLADE_DIR = os.path.join(os.path.dirname(__file__), "glade")
+
+    def __init__(self, stand_alone):
+        """
+        Initialize content management dialog
+        @param stand_alone: Boolean, Is this dialog running as a stand alone
+            process
+        """
+        self.stand_alone = stand_alone
+        self.config = Configuration()
+        self.weather = Weather()
+
+        # Load glade UI
+        self.gladefile = os.path.join(self.GLADE_DIR,
+            "entertainer-content-management.glade")
+        self.widgets = gtk.glade.XML(self.gladefile)
+
+        # Get content management dialog and bind signal callbacks
+        self.dialog = self.widgets.get_widget("ContentManagementDialog")
+        if (self.dialog):
+            callback_dic = {
+                "on_button_open_list_clicked" :
+                    self.on_button_open_list_clicked,
+                "on_close_button_clicked" : self.on_close_button_clicked,
+                "on_button_remove_videos_clicked" :
+                    self.on_button_remove_videos_clicked,
+                "on_button_add_videos_clicked" :
+                    self.on_button_add_videos_clicked,
+                "on_button_edit_videos_clicked" :
+                    self.on_button_edit_videos_clicked,
+                "on_checkbutton_video_metadata_toggled" :
+                    self.on_checkbutton_video_metadata_toggled,
+                "on_button_add_music_clicked" :
+                    self.on_button_add_music_clicked,
+                "on_button_remove_music_clicked" :
+                    self.on_button_remove_music_clicked,
+                "on_button_edit_music_clicked" :
+                    self.on_button_edit_music_clicked,
+                "on_lyrics_checkbox_toggled" : self.on_lyrics_checkbox_toggled,
+                "on_art_checkbox_toggled" : self.on_art_checkbox_toggled,
+                "on_button_add_images_clicked" :
+                    self.on_button_add_images_clicked,
+                "on_button_remove_images_clicked" :
+                    self.on_button_remove_images_clicked,
+                "on_button_edit_images_clicked" :
+                    self.on_button_edit_images_clicked,
+                "on_button_add_feed_clicked" :
+                    self.on_button_add_feed_clicked,
+                "on_button_remove_feed_clicked" :
+                    self.on_button_remove_feed_clicked,
+                "on_button_edit_feed_clicked" :
+                    self.on_button_edit_feed_clicked,
+                "on_fetch_interval_spinbutton_value_changed" :
+                    self.on_fetch_interval_spinbutton_value_changed,
+                "on_ContentManagementDialog_destroy" : self.on_dialog_closed,
+                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event,
+                "on_url_dialog_ok_button_clicked" :
+                    self.on_url_dialog_ok_button_clicked,
+                "on_url_dialog_cancel_button_clicked" :
+                    self.on_url_dialog_cancel_button_clicked,
+                "on_button_video_rebuild_clicked" :
+                    self.on_button_video_rebuild_clicked,
+                "on_button_music_rebuild_clicked" :
+                    self.on_button_music_rebuild_clicked,
+                "on_button_image_rebuild_clicked" :
+                    self.on_button_image_rebuild_clicked,
+                "on_button_feed_rebuild_clicked" :
+                    self.on_button_feed_rebuild_clicked,
+                "on_button_add_weather_clicked" :
+                    self.on_button_add_weather_clicked,
+                "on_button_remove_weather_clicked" :
+                    self.on_button_remove_weather_clicked,
+                "on_weather_display_checkbox_toggled" :
+                    self.on_weather_display_checkbox_toggled,
+                "on_location_find_button_clicked" :
+                    self.on_location_find_button_clicked,
+                "on_location_cancel_button_clicked" :
+                    self.on_location_cancel_button_clicked,
+                "on_location_add_button_clicked" :
+                    self.on_location_add_button_clicked,
+                "on_location_entry_activate" : self.on_location_entry_activate}
+        self.widgets.signal_autoconnect(callback_dic)
+
+        # Initialize dialog widgets with correct values and show dialog
+        self.init_dialog_values_from_configure_file()
+        self.dialog.resize(500, 300)
+        self.dialog.show()
+
+        # Initialize location list in search dialog
+        result_list = self.widgets.get_widget("location_results_treeview")
+        store = gtk.ListStore(str)
+        result_list.set_model(store)
+        cell_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn(_("Location"), cell_renderer, text=0)
+        result_list.append_column(column)
+
+# Signal handlers
+
+    def on_dialog_closed(self, widget):
+        """Callback function for dialog's close button"""
+        try:
+            proxy = MessageBusProxy(client_name = "Content Management GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                    None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                        "Entertainer backend is not running. "
+                        "Cache cannot be rebuilt."
+                    ))
+            error.run()
+            error.destroy()
+
+
+        if(self.stand_alone):
+            self.dialog.hide()
+            self.dialog.destroy()
+            gtk.main_quit()
+        else:
+            self.dialog.hide()
+            self.dialog.destroy()
+
+    def on_close_button_clicked(self, widget):
+        """Callback function for dialog's close button"""
+        if(self.stand_alone):
+            self.dialog.hide()
+            self.dialog.destroy()
+            gtk.main_quit()
+        else:
+            self.dialog.hide()
+            self.dialog.destroy()
+
+    def on_button_add_videos_clicked(self, widget):
+        """Opens add URL dialog. """
+        widget = self.widgets.get_widget("treeview_videos")
+        model = widget.get_model()
+        # Open "Select folder" dialog
+        dialog =  gtk.FileChooserDialog(_("Select video folder"), None,
+            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
+            (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,
+                gtk.STOCK_OPEN,gtk.RESPONSE_OK),
+            None)
+        status = dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            self.add_to_model_and_config(dialog.get_current_folder(), model,
+                self.video_folders, "Videos")
+        dialog.destroy()
+
+    def on_button_remove_videos_clicked(self, widget):
+        """Remove currently selected folder from video folders"""
+        widget = self.widgets.get_widget("treeview_videos")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        rm_folder = model.get_value(selection[1], 0)
+        self.video_folders.remove(rm_folder)
+        str_folders = ";".join(self.video_folders)
+        self.config.write_content_value("Videos", "folders", str_folders)
+        model.remove(selection[1])
+
+    def on_button_edit_videos_clicked(self, widget):
+        """Edit currently selected folder"""
+        widget = self.widgets.get_widget("treeview_videos")
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        folder = model.get_value(selection[1], 0)
+        url_entry.set_text(folder)
+        url_dialog.set_title(_("Edit URL"))
+        status = url_dialog.run()
+        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
+            # Update list model
+            model.set_value(selection[1], 0, self.url)
+            # Update configure file
+            pos = self.video_folders.index(folder)
+            self.video_folders.remove(folder)
+            self.video_folders.insert(pos, self.url)
+            str_folders = ";".join(self.video_folders)
+            self.config.write_content_value("Videos", "folders",
+                str_folders)
+
+    def on_checkbutton_video_metadata_toggled(self, widget):
+        """
+        Download video file metadata from internet
+        @param widget: GTK-Widget
+        """
+        self.config.write_content_value("Videos", "download_metadata",
+            widget.get_active())
+
+    def on_button_add_music_clicked(self, widget):
+        """
+        Opens add URL dialog
+        @param widget: GTK-Widget
+        """
+        widget = self.widgets.get_widget("treeview_music")
+        model = widget.get_model()
+        # Open "Select folder" dialog
+        dialog =  gtk.FileChooserDialog(_("Select music folder"), None,
+            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
+            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
+                gtk.RESPONSE_OK),
+            None)
+        status = dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            self.add_to_model_and_config(dialog.get_current_folder(), model,
+                self.music_folders, "Music")
+        dialog.destroy()
+
+    def on_button_remove_music_clicked(self, widget):
+        """Remove currently selected folder from music folders"""
+        widget = self.widgets.get_widget("treeview_music")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        rm_folder = model.get_value(selection[1], 0)
+        self.music_folders.remove(rm_folder)
+        str_folders = ";".join(self.music_folders)
+        self.config.write_content_value("Music", "folders", str_folders)
+        model.remove(selection[1])
+
+    def on_button_edit_music_clicked(self, widget):
+        """Edit currently selected music folder"""
+        widget = self.widgets.get_widget("treeview_music")
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        folder = model.get_value(selection[1], 0)
+        url_entry.set_text(folder)
+        url_dialog.set_title(_("Edit URL"))
+        status = url_dialog.run()
+        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
+            # Update list model
+            model.set_value(selection[1], 0, self.url)
+            # Update configure file
+            pos = self.music_folders.index(folder)
+            self.music_folders.remove(folder)
+            self.music_folders.insert(pos, self.url)
+            str_folders = ";".join(self.music_folders)
+            self.config.write_content_value("Music", "folders", str_folders)
+
+    def on_button_add_images_clicked(self, widget):
+        """Opens add URL dialog. """
+        widget = self.widgets.get_widget("treeview_images")
+        model = widget.get_model()
+        # Open "Select folder" dialog
+        dialog =  gtk.FileChooserDialog(_("Select image folder"), None,
+            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
+            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
+                gtk.RESPONSE_OK),
+            None)
+        status = dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            self.add_to_model_and_config(dialog.get_current_folder(), model,
+                self.image_folders, "Images")
+        dialog.destroy()
+
+    def on_button_remove_images_clicked(self, widget):
+        """Remove currently selected folder from images folders"""
+        widget = self.widgets.get_widget("treeview_images")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        rm_folder = model.get_value(selection[1], 0)
+        self.image_folders.remove(rm_folder)
+        str_folders = ";".join(self.image_folders)
+        self.config.write_content_value("Images", "folders", str_folders)
+        model.remove(selection[1])
+
+    def on_button_edit_images_clicked(self, widget):
+        """Edit currently selected music folder"""
+        widget = self.widgets.get_widget("treeview_images")
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        folder = model.get_value(selection[1], 0)
+        url_entry.set_text(folder)
+        url_dialog.set_title(_("Edit URL"))
+        status = url_dialog.run()
+        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
+            # Update list model
+            model.set_value(selection[1], 0, self.url)
+            # Update configure file
+            pos = self.image_folders.index(folder)
+            self.image_folders.remove(folder)
+            self.image_folders.insert(pos, self.url)
+            str_folders = ";".join(self.image_folders)
+            self.config.write_content_value("Images", "folders",
+                str_folders)
+
+    def on_button_add_feed_clicked(self, widget):
+        """Opens add feed dialog. """
+        widget = self.widgets.get_widget("treeview_feeds")
+        url_dialog = self.widgets.get_widget("url_dialog")
+        model = widget.get_model()
+        # Open dialog
+        url_dialog.set_title(_("Add RSS-feed"))
+        status = url_dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            model.append([self.url])
+            self.feeds.append(self.url)
+            str_folders = ";".join(self.feeds)
+            self.config.write_content_value("RSS", "feeds", str_folders)
+
+    def on_button_remove_feed_clicked(self, widget):
+        """Remove currently selected reed from RSS-feeds"""
+        widget = self.widgets.get_widget("treeview_feeds")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        rm_folder = model.get_value(selection[1], 0)
+        self.feeds.remove(rm_folder)
+        str_folders = ";".join(self.feeds)
+        self.config.write_content_value("RSS", "feeds", str_folders)
+        model.remove(selection[1])
+
+    def on_button_edit_feed_clicked(self, widget):
+        """Edit currently selected feed"""
+        widget = self.widgets.get_widget("treeview_feeds")
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        feed = model.get_value(selection[1], 0)
+        url_entry.set_text(feed)
+        url_dialog.set_title(_("Edit feed"))
+        status = url_dialog.run()
+        if status == gtk.RESPONSE_OK:
+            # Update list model
+            model.set_value(selection[1], 0, self.url)
+            # Update configure file
+            pos = self.feeds.index(feed)
+            self.feeds.remove(feed)
+            self.feeds.insert(pos, self.url)
+            str_feeds = ";".join(self.feeds)
+            self.config.write_content_value("RSS", "feeds", str_feeds)
+
+    def on_button_open_list_clicked(self, widget):
+        """Opens the open feed source dialog"""
+        open_dialog = OpenFeedSourceDialog(
+            self.widgets.get_widget("treeview_feeds"), self.feeds)
+        open_dialog.dialog.connect("destroy", open.on_closeButton_clicked)
+        open_dialog.dialog.hide()
+        open_dialog.dialog.destroy()
+
+    def on_fetch_interval_spinbutton_value_changed(self, widget):
+        self.config.write_content_value("RSS", "fetch_interval",
+            widget.get_value_as_int())
+
+    def on_lyrics_checkbox_toggled(self, widget):
+        self.config.write_content_value("Music", "download_lyrics",
+            widget.get_active())
+
+    def on_art_checkbox_toggled(self, widget):
+        self.config.write_content_value("Music", "download_album_art",
+            widget.get_active())
+
+    def on_url_dialog_ok_button_clicked(self, widget):
+        """URL dialog OK button pressed. Sets self.url"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        url_dialog.hide()
+        self.url = url_entry.get_text()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_OK)
+
+    def on_url_dialog_cancel_button_clicked(self, widget):
+        """URL dialog cancelled. Hides dialog"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_url_dialog_delete_event(self, widget, data):
+        """Dialog's X clicked. Hides dialog"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+        return True
+
+    def on_button_add_weather_clicked(self, widget):
+        """
+        Open location search dialog
+        @param widget: GTK-Widget
+        """
+        location_dialog = self.widgets.get_widget("weather_search_dialog")
+        location_dialog.set_title(_("Add location"))
+
+        # Clear results
+        result_list = self.widgets.get_widget("location_results_treeview")
+        model = result_list.get_model()
+        model.clear()
+
+        status = location_dialog.run()
+        if(status == gtk.RESPONSE_OK):
+            print "Added"
+
+    def on_button_remove_weather_clicked(self, widget):
+        """
+        Remove currently selected weather location from the location list
+        @param widget: GTK-Widget
+        """
+        widget = self.widgets.get_widget("treeview_locations")
+        model = widget.get_model()
+        self.weather_locations = []
+        str_folders = ""
+        self.config.write_content_value("Weather", "location", str_folders)
+        model.clear()
+
+    def on_weather_display_checkbox_toggled(self, widget):
+        """
+        Checkbox that defines should we use weather conditions
+        @param widget: GTK-Widget
+        """
+        self.config.write_content_value("Weather", "display_in_menu",
+            widget.get_active())
+        if widget.get_active():
+            self.widgets.get_widget("button_add_weather").set_sensitive(True)
+            self.widgets.get_widget(
+                "button_remove_weather").set_sensitive(True)
+            self.widgets.get_widget("treeview_locations").set_sensitive(True)
+        else:
+            self.widgets.get_widget("button_add_weather").set_sensitive(False)
+            self.widgets.get_widget(
+                "button_remove_weather").set_sensitive(False)
+            self.widgets.get_widget("treeview_locations").set_sensitive(False)
+
+    def on_location_find_button_clicked(self, widget):
+        """
+        Find location by search string
+        @param widget: GTK-Widget
+        """
+        add_button = self.widgets.get_widget("location_add_button")
+        search_term = self.widgets.get_widget("location_entry").get_text()
+        result_list = self.widgets.get_widget("location_results_treeview")
+        model = result_list.get_model()
+        model.clear()
+        if search_term != "":
+            self.weather.set_location(search_term)
+            self.weather.refresh()
+            results = self.weather.get_forecasts()
+            if len(results) > 0:
+                add_button.set_sensitive(True)
+                model.append([search_term])
+                result_list.set_cursor(0)
+            else:
+                model.clear()
+                model.append([_("Location Not Found!")])
+                add_button.set_sensitive(False)
+
+    def on_location_cancel_button_clicked(self, widget):
+        """
+        Close location search dialog without taking any actions.0
+        @param widget: GTK-Widget
+        """
+        location_dialog = self.widgets.get_widget("weather_search_dialog")
+        location_entry = self.widgets.get_widget("location_entry")
+        location_dialog.hide()
+        location_entry.set_text("")
+        location_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_location_add_button_clicked(self, widget):
+        """
+        Add selected location to location list and close search dialog
+        @param widget: GTK-Widget
+        """
+        self.weather_locations = []
+        result_list = self.widgets.get_widget("location_results_treeview")
+        model = result_list.get_model()
+        selection = result_list.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        location_string = model.get_value(selection[1], 0)
+
+        location_list = self.widgets.get_widget("treeview_locations")
+        loc_model = location_list.get_model()
+        loc_model.clear()
+        loc_model.append([location_string])
+
+        self.weather_locations.append(location_string)
+        str_locations = ";".join(self.weather_locations)
+        self.config.write_content_value("Weather", "location", str_locations)
+
+        location_dialog = self.widgets.get_widget("weather_search_dialog")
+        location_entry = self.widgets.get_widget("location_entry")
+        location_dialog.hide()
+        location_entry.set_text("")
+        location_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_location_entry_activate(self, widget):
+        """
+        User hit enter on location entry to start search
+        @param widget: GTK-Widget
+        """
+        self.on_location_find_button_clicked(widget)
+
+    def on_button_video_rebuild_clicked(self, widget):
+        """
+        Rebuild video cache requested
+        @param widget: GTK-Widget
+        """
+        try:
+            proxy = MessageBusProxy(client_name = "Content Management GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.REBUILD_VIDEO_CACHE))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                None, gtk.DIALOG_MODAL,
+                gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                    "Entertainer backend is not running. "
+                    "Cache cannot be rebuilt."
+                ))
+            error.run()
+            error.destroy()
+
+    def on_button_music_rebuild_clicked(self, widget):
+        """
+        Rebuild music cache requested
+        @param widget: GTK-Widget
+        """
+        try:
+            proxy = MessageBusProxy(client_name = "Content Management GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.REBUILD_MUSIC_CACHE))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                None, gtk.DIALOG_MODAL,
+                gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                    "Entertainer backend is not running. "
+                    "Cache cannot be rebuilt."
+                ))
+            error.run()
+            error.destroy()
+
+    def on_button_image_rebuild_clicked(self, widget):
+        """
+        Rebuild image cache requested
+        @param widget: GTK-Widget
+        """
+        try:
+            proxy = MessageBusProxy(client_name = "Content Management GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.REBUILD_IMAGE_CACHE))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                None, gtk.DIALOG_MODAL,
+                gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                    "Entertainer backend is not running. "
+                    "Cache cannot be rebuilt."
+                ))
+            error.run()
+            error.destroy()
+
+    def on_button_feed_rebuild_clicked(self, widget):
+        """
+        Rebuild feed cache requested
+        @param widget: GTK-Widget
+        """
+        #We need the user to confirm the rebuild feed cache request
+        dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING,
+            gtk.BUTTONS_OK_CANCEL,
+            _("This will completely remove any feed entries in the cache!"))
+        status = dialog.run()
+        #If user has ok'd the request send the message to the message bus
+        if(status == gtk.RESPONSE_OK):
+            try:
+                proxy = MessageBusProxy(client_name = "Content Management GUI")
+                proxy.connectToMessageBus()
+                proxy.sendMessage(Message(MessageType.REBUILD_FEED_CACHE))
+                proxy.disconnectFromMessageBus()
+            except socket.error:
+                error = gtk.MessageDialog(
+                    None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                        "Entertainer backend is not running. "
+                        "Cache cannot be rebuilt."
+                    ))
+                error.run()
+                error.destroy()
+
+        dialog.destroy()
+
+    def init_dialog_values_from_configure_file(self):
+        """Read configuration and set dialog widget values with read values.
+        """
+        # == Videos ==
+        videolist_widget = self.widgets.get_widget("treeview_videos")
+        videostore = gtk.ListStore(str)
+
+        cell_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn(_("Folders"), cell_renderer, text=0)
+        videolist_widget.append_column(column)
+
+        self.video_folders = self.config.get_video_folders()
+
+        # Fill model with folders read from config file
+        self.init_model(videostore, self.video_folders)
+
+        videolist_widget.set_model(videostore)
+
+        # Checkboxes
+        metadata_checkbox = self.widgets.get_widget("video_metadata_checkbox")
+        md_val = self.config.download_video_metadata()
+        metadata_checkbox.set_active(md_val)
+
+        # == Music ==
+        musiclist_widget = self.widgets.get_widget("treeview_music")
+        music_model = gtk.ListStore(str)
+
+        music_cell = gtk.CellRendererText()
+        music_column = gtk.TreeViewColumn(_("Folders"), music_cell, text=0)
+        musiclist_widget.append_column(music_column)
+
+        self.music_folders = self.config.get_music_folders()
+
+        # Fill model with folders read from config file
+        self.init_model(music_model, self.music_folders)
+
+        musiclist_widget.set_model(music_model)
+
+        # Checkboxes
+        art_checkbox = self.widgets.get_widget("art_checkbox")
+        art_val = self.config.download_album_art()
+        art_checkbox.set_active(art_val)
+
+        lyrics_checkbox = self.widgets.get_widget("lyrics_checkbox")
+        lyrics_val = self.config.download_lyrics()
+        lyrics_checkbox.set_active(lyrics_val)
+
+        # == Images ==
+        imagelist_widget = self.widgets.get_widget("treeview_images")
+        images_model = gtk.ListStore(str)
+
+        img_cell = gtk.CellRendererText()
+        img_column = gtk.TreeViewColumn(_("Folders"), img_cell, text=0)
+        imagelist_widget.append_column(img_column)
+
+        self.image_folders = self.config.get_image_folders()
+
+        # Fill model with folders read from config file
+        self.init_model(images_model, self.image_folders)
+
+        imagelist_widget.set_model(images_model)
+
+        # == RSS-feeds ==
+        feedlist_widget = self.widgets.get_widget("treeview_feeds")
+        feed_model = gtk.ListStore(str)
+
+        rss_cell = gtk.CellRendererText()
+        rss_column = gtk.TreeViewColumn(_("Feeds"), rss_cell, text=0)
+        feedlist_widget.append_column(rss_column)
+
+        self.feeds = self.config.get_feeds()
+
+        # Fill model with folders read from config file
+        for i in range(len(self.feeds)):
+            feed_model.insert(i, [self.feeds[i]])
+
+        feedlist_widget.set_model(feed_model)
+
+        # Interval spinner
+        interval_spinner = self.widgets.get_widget("fetch_interval_spinbutton")
+        interval_val = self.config.get_feed_fetch_interval()
+        if interval_val < 15:
+            interval_val = 15
+        elif interval_val > 900:
+            interval_val = 900
+        interval_spinner.set_value(interval_val)
+
+        # == Weather location ==
+        locationlist_widget = self.widgets.get_widget("treeview_locations")
+        location_model = gtk.ListStore(str)
+
+        loc_cell = gtk.CellRendererText()
+        location_column = gtk.TreeViewColumn(_("Location"), loc_cell, text=0)
+        locationlist_widget.append_column(location_column)
+
+        self.weather_location = self.config.get_weather_location()
+
+        # Fill model with location read from config file
+        location_model.insert(0, [self.weather_location])
+
+        locationlist_widget.set_model(location_model)
+
+        # Checkboxes
+        weather_display_checkbox = self.widgets.get_widget(
+            "weather_display_checkbox")
+        display_val = self.config.display_weather_in_client()
+        weather_display_checkbox.set_active(display_val)
+        if not display_val:
+            self.widgets.get_widget("button_add_weather").set_sensitive(False)
+            self.widgets.get_widget("button_remove_weather").set_sensitive(
+                False)
+            self.widgets.get_widget("treeview_locations").set_sensitive(False)
+
+    def add_to_model_and_config(self, selected_folder, model, folders, kind):
+        """
+        Add selected_folder to the model and the folders list while updating
+        the configuration item section specified by type
+        """
+        if not selected_folder in folders:
+            model.append([selected_folder])
+
+            if(folders == None):
+                folders = [selected_folder]
+            else:
+                folders.append(selected_folder)
+
+            if "" in folders:
+                folders.remove("")
+            str_folders = ";".join(folders)
+            self.config.write_content_value(kind, "folders", str_folders)
+
+    def init_model(self, model, items):
+        """Fill model with items from supplied list"""
+        for i in range(len(items)):
+            if not str(items[i]).strip() == "":
+                model.insert(i, [items[i]])
+
+
+class LogViewer:
+    """
+    Implements dialog that allows user to see logged events.
+
+    This dialog is used to check Entertainer logfiles. It reads all data from
+    selected file and saves rows to self.log_rows. Then it filters unwanted
+    rows away by calling self.filterMessages(). This method adds rows to
+    ListStore, which is the model of TreeView object.
+
+    Combobox and refresh -button actions read files again
+    Checkbox actions just filter current rows again
+    """
+
+    GLADE_DIR = os.path.join(os.path.dirname(__file__), "glade")
+
+    # Is this dialog running as a stand alone process
+    __STAND_ALONE = None
+
+    widgets = None
+    dialog = None
+    log_store = None
+    log_rows = []
+
+    gladefile = os.path.join(GLADE_DIR, "log_dialog.glade")
+
+    def __init__(self, stand_alone):
+        self.logfile_entertainer = Configuration().ENTERTAINER_LOG
+        self.logger = Logger().getLogger('utils.log_viewer')
+
+        self.__STAND_ALONE = stand_alone
+        try:
+            self.widgets = gtk.glade.XML(self.gladefile)
+        except RuntimeError:
+            self.logger.critical("Couldn't open glade file: " + self.gladefile)
+            sys.exit(1)
+        callback_dic = {
+            "on_close_log_button_clicked" : self.on_close_log_button_clicked,
+            "on_log_refresh_button_clicked" : self.update_log_rows,
+            "on_checkbutton_debug_toggled" : self.filter_messages,
+            "on_checkbutton_critical_toggled" : self.filter_messages,
+            "on_checkbutton_error_toggled" : self.filter_messages,
+            "on_checkbutton_warning_toggled" : self.filter_messages,
+            "on_checkbutton_info_toggled" : self.filter_messages }
+
+        self.widgets.signal_autoconnect(callback_dic)
+
+        # Create log treeview
+        treeview = self.widgets.get_widget("treeview_log")
+        cell_renderer1 = gtk.CellRendererText()
+        cell_renderer2 = gtk.CellRendererText()
+        cell_renderer3 = gtk.CellRendererText()
+        cell_renderer4 = gtk.CellRendererText()
+
+        column1 = gtk.TreeViewColumn("Date")
+        column1.pack_start(cell_renderer1, True)
+        column1.set_attributes(cell_renderer1, text = 0)
+
+        column2 = gtk.TreeViewColumn("Time")
+        column2.pack_start(cell_renderer2, True)
+        column2.set_attributes(cell_renderer2, text = 1)
+
+        column3 = gtk.TreeViewColumn("Type")
+        column3.pack_start(cell_renderer3, True)
+        column3.set_attributes(cell_renderer3, text = 2)
+
+        column4 = gtk.TreeViewColumn("Message")
+        column4.pack_end(cell_renderer4, True)
+        column4.set_attributes(cell_renderer4, text = 3)
+
+        treeview.append_column(column1)
+        treeview.append_column(column2)
+        treeview.append_column(column3)
+        treeview.append_column(column4)
+        treeview.set_headers_visible(True)
+
+        # Set model to view and read data from logfile
+        self.log_store = gtk.ListStore(str, str, str, str)
+        treeview.set_model(self.log_store)
+        self.update_log_rows()
+
+        # Show Log viewer dialog
+        self.dialog = self.widgets.get_widget("LogDialog")
+        self.dialog.resize(750, 500)
+        self.dialog.connect("destroy", self.on_close_log_button_clicked)
+        self.dialog.show()
+
+    def update_log_rows(self, widget=None):
+        """Read logfile and udpate treeview"""
+        self.log_rows[:] = []
+
+        try:
+            for line in open(self.logfile_entertainer, 'r'):
+                try:
+                    line_table = line.split()
+                    message = ' '.join(line_table[3:])
+                    row = line_table[:3] + [message]
+                    parsed_row = parse_row(row)
+                    self.log_rows.append(parsed_row)
+                except IndexError:
+                    print "Cannot parse log line: ", line
+        except IOError:
+            print "Cannot find logfile: ", self.logfile_entertainer
+
+        # Reverse so that the latest message is at top
+        self.log_rows.reverse()
+        # Filter unwated message types
+        self.filter_messages()
+
+    def filter_messages(self, widget = None):
+        """Checks which message types should be displayed on treeview"""
+        if self.log_store:
+            self.log_store.clear()
+
+        debug = self.widgets.get_widget("checkbutton_debug").get_active()
+        critical = self.widgets.get_widget("checkbutton_critical").get_active()
+        error = self.widgets.get_widget("checkbutton_error").get_active()
+        warning = self.widgets.get_widget("checkbutton_warning").get_active()
+        info = self.widgets.get_widget("checkbutton_info").get_active()
+
+        for element in self.log_rows:
+            if element[2] == "DEBUG" and debug:
+                self.log_store.append(element)
+            elif element[2] == "CRITICAL" and critical:
+                self.log_store.append(element)
+            elif element[2] == "ERROR" and error:
+                self.log_store.append(element)
+            elif element[2] == "WARNING" and warning:
+                self.log_store.append(element)
+            elif element[2] == "INFO" and info:
+                self.log_store.append(element)
+
+    # Signal handlers
+    def on_close_log_button_clicked(self, widget):
+        """
+        If running as a stand alone process, quit.
+        Otherwise only destroy dialog.
+        """
+        self.dialog.hide()
+        self.dialog.destroy()
+        if(self.__STAND_ALONE):
+            gtk.main_quit()
+
+
+def parse_row(row):
+    """
+    This parses the input list into a list suitable for the logviewer
+    @author Joshua Scotton
+    @param row The input list [Date, Time, Class, Type + Description]
+    """
+    if row[3][:5] == "DEBUG":
+        return [row[0], row[1], "DEBUG",
+            row[2] + ": " + row[3][5:]]
+    elif row[3][:8] == "CRITICAL":
+        return [row[0], row[1], "CRITICAL",
+            row[2] + ": " + row[3][8:]]
+    elif row[3][:5] == "ERROR":
+        return [row[0], row[1], "ERROR",
+            row[2] + ": " + row[3][5:]]
+    elif row[3][:7] == "WARNING":
+        return [row[0], row[1], "WARNING",
+            row[2] + ": " + row[3][7:]]
+    elif row[3][:4] == "INFO":
+        return [row[0], row[1], "INFO",
+            row[2] + ": " + row[3][4:]]
+
+
+class OpenFeedSourceDialog:
+    '''Feed source reader dialog'''
+
+    GLADE_DIR = os.path.join(os.path.dirname(__file__), "glade")
+
+    widgets = None
+    dialog = None
+    tree_widget = None
+    feeds = None
+    url = None
+
+    def __init__(self, the_widget, the_feeds):
+        """initialises the gtk window and displays it"""
+
+        #feeds is a pointer to a list of feeds from the config file
+        self.feeds = the_feeds
+
+        #needed so we can add feeds to the feed list widget
+        self.tree_widget = the_widget
+
+        # Load glade UI
+        self.gladefile = os.path.join(self.GLADE_DIR,
+            "open_feed_source_dialog.glade")
+        self.widgets = gtk.glade.XML(self.gladefile)
+
+        # Get content management dialog and bind signal callbacks
+        self.dialog = self.widgets.get_widget("open_source_dialog")
+        if (self.dialog):
+            callback_dic = {
+                "on_fileOpen_clicked" : self.on_fileOpen_clicked,
+                "on_lifereaButton_clicked" : self.on_lifereaButton_clicked,
+                "on_enterURL_clicked" : self.on_enterURL_clicked,
+                "on_closeButton_clicked" : self.on_closeButton_clicked,
+                "on_url_dialog_ok_button_clicked" :
+                    self.on_url_dialog_ok_button_clicked,
+                "on_url_dialog_cancel_button_clicked" :
+                    self.on_url_dialog_cancel_button_clicked,
+                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event
+                 }
+
+        self.widgets.signal_autoconnect(callback_dic)
+
+        # Initilize dialog widgets with correct values and show dialog
+        self.dialog.resize(300, 200)
+        self.dialog.run()
+
+    def on_fileOpen_clicked(self, widget):
+        """Opens add file dialog and then adds all feeds in the opml file
+        selected """
+
+        #get the model for the feed list widget so we can add the new feeds
+        model = self.tree_widget.get_model()
+
+        #create select file dialog
+        dialog = gtk.FileChooserDialog(_("Select OPML file"), None,
+            gtk.FILE_CHOOSER_ACTION_OPEN,
+            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
+                gtk.RESPONSE_OK))
+
+        #set dialog up to filter for only opml files
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("OPML files"))
+        file_filter.add_pattern("*.opml")
+        dialog.add_filter(file_filter)
+
+        #set dialog up to allow multiple selections
+        dialog.set_select_multiple(True)
+
+        #run the dialog
+        status = dialog.run()
+
+        # if file was selected, get list of feeds from it and add to
+        #model and update config file
+        if(status == gtk.RESPONSE_OK):
+            FeedConfigTools().add_file_feeds_to_widget(
+                dialog.get_filenames(), model, self.feeds)
+        dialog.destroy()
+
+    def on_lifereaButton_clicked(self, widget):
+        """Adds any liferea feeds it finds to the feed widget and config file
+        """
+        #get the model
+        model = self.tree_widget.get_model()
+        #get the liferea feeds and then send everything to the
+        #add_file_feeds_to_widget method
+        FeedConfigTools().add_file_feeds_to_widget(
+            [OPMLParser().get_liferea_opml()], model, self.feeds)
+
+    def on_enterURL_clicked(self, widget):
+        """gets a opml file link from a user and adds any feeds it finds to the
+        feed widget and config file"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        model = self.tree_widget.get_model()
+        # Open dialog
+        url_dialog.set_title(_("Add OPML File"))
+        status = url_dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            FeedConfigTools().add_file_feeds_to_widget([self.url],
+                model, self.feeds)
+
+    def on_closeButton_clicked(self, widget):
+        self.dialog.hide()
+        self.dialog.destroy()
+
+    def on_url_dialog_ok_button_clicked(self, widget):
+        """URL dialog OK button pressed. Sets self.url"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        url_dialog.hide()
+        self.url = url_entry.get_text()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_OK)
+
+    def on_url_dialog_cancel_button_clicked(self, widget):
+        """URL dialog cancelled. Hides dialog"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_url_dialog_delete_event(self, widget, data):
+        """Dialog's X clicked. Hides dialog"""
+        url_dialog = self.widgets.get_widget("url_dialog")
+        url_entry = self.widgets.get_widget("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+        return True
+
+
+class PreferencesDialog:
+    """This is a preferences editing tool for Entertainer media center."""
+
+    # Glade file location
+    GLADE_DIR = os.path.join(os.path.dirname(__file__), "glade")
+
+    def __init__(self, stand_alone):
+        """
+        Initialize Preferenced dialog
+        @param stand_alone: Is this dialog stand alone process or part of
+            client
+        """
+        # Is this dialog running as a stand alone process
+        self.STAND_ALONE = stand_alone
+        self.themes = []
+        self.config = Configuration()
+
+        # Load glade UI
+        self.gladefile = os.path.join(self.GLADE_DIR,
+            "entertainer-preferences.glade")
+        self.widgets = gtk.glade.XML(self.gladefile)
+
+        # Get preferences dialog and bind signal callbacks
+        self.pref_dialog = self.widgets.get_widget("PreferencesDialog")
+        if (self.pref_dialog):
+            callback_dic = {
+                "on_close_button_clicked" : self.on_close_button_clicked,
+                "on_PreferencesDialog_delete_event" : self.on_dialog_closed,
+                "on_theme_list_cursor_changed" :
+                    self.on_theme_list_cursor_changed,
+                "on_checkbutton_autostart_toggled" :
+                    self.on_checkbutton_autostart_toggled,
+                "on_checkbutton_fullscreen_toggled" :
+                    self.on_checkbutton_fullscreen_toggled,
+                "on_checkbutton_systray_icon_toggled" :
+                    self.on_checkbutton_systray_icon_toggled,
+                "on_effect_checkbox_toggled" : self.on_effect_checkbox_toggled,
+                "on_effect_combobox_changed" : self.on_effect_combobox_changed,
+                "on_add_button_clicked" : self.on_add_button_clicked,
+                "on_remove_button_clicked" : self.on_remove_button_clicked,
+                "on_spinbutton_slideshow_step_value_changed":
+                    self.on_spinbutton_slideshow_step_value_changed
+            }
+        self.widgets.signal_autoconnect(callback_dic)
+
+        # Initilize dialog widgets with correct values and show dialog
+        self.init_dialog_values_from_configure_file()
+        #self.pref_dialog.resize(500,400)
+        self.pref_dialog.show()
+
+    def load_themes(self):
+        """Load themes"""
+        themes = os.listdir(os.path.join(self.config.get_cfg_dir(), 'themes'))
+        for element in themes:
+            theme = os.path.join(self.config.get_cfg_dir(), 'themes', element)
+            if os.path.isdir(theme):
+                self.themes.append(element)
+
+    def on_add_button_clicked(self, widget):
+        """Add theme button clicked"""
+        themelist = self.widgets.get_widget("theme_list")
+        model = themelist.get_model()
+        # Open "Select folder" dialog
+        dialog = gtk.FileChooserDialog(_("Select theme package file"),
+            None, gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,
+            gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK), None)
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("Theme package (tar.gz)"))
+        file_filter.add_pattern("*.tar.gz")
+        dialog.add_filter(file_filter)
+        status = dialog.run()
+
+        # If theme was selected with file chooser
+        if(status == gtk.RESPONSE_OK):
+            package = dialog.get_filename()
+            tar = tarfile.open(package, 'r:gz') # Open tar.gz package
+
+            # Make sure that package contains configuration file (is theme)
+            content = tar.getnames()
+            theme_name = None
+            is_theme = False
+            for element in content:
+                if element[-10:] == "theme.conf":
+                    theme_name = element[:-11]
+                    is_theme = True
+
+            # Install them
+            if is_theme:
+                tar.extractall(os.path.join(self.config.get_cfg_dir(),
+                    'themes'))
+                model.insert(len(model), [theme_name])
+            else:
+                error = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("Invalid theme file!"))
+                error.run()
+                error.destroy()
+
+        dialog.destroy()
+
+    def on_remove_button_clicked(self, widget):
+        """Remove theme button clicked"""
+        # Get currently selected theme
+        themelist = self.widgets.get_widget("theme_list")
+        model = themelist.get_model()
+        selection = themelist.get_selection().get_selected()
+        name = model.get_value(selection[1], 0)
+
+        confirm = gtk.MessageDialog(None,
+            gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
+                _("Are you sure you want to delete\ntheme: %(name)s") % \
+                {'name': name})
+        status = confirm.run()
+        confirm.destroy()
+        if(status == gtk.RESPONSE_YES):
+            themedir = os.path.join(self.config.get_cfg_dir(), 'themes', name)
+            shutil.rmtree(themedir)
+            model.remove(selection[1])
+            themelist.set_cursor(0)
+            self.themes.remove(name)
+
+    def on_theme_list_cursor_changed(self, widget):
+        """Executed when theme is changed in theme list. Update preview."""
+        # Get currently selected theme
+        themelist = self.widgets.get_widget("theme_list")
+        model = themelist.get_model()
+        selection = themelist.get_selection().get_selected()
+        name = model.get_value(selection[1], 0)
+        themedir = os.path.join(self.config.get_cfg_dir(), 'themes', name)
+        theme = Theme(theme_path=themedir)
+
+        # Update preview
+        image = self.widgets.get_widget("theme_image")
+        image.set_from_file(os.path.join(themedir, "thumbnail.png"))
+        name = self.widgets.get_widget("name_label")
+        name.set_text(theme.getName())
+        author = self.widgets.get_widget("author_label")
+        author.set_text(theme.getAuthor())
+        licence = self.widgets.get_widget("licence_label")
+        licence.set_text(theme.getLicence())
+        copyright_label = self.widgets.get_widget("copyright_label")
+        copyright_label.set_text(theme.getCopyright())
+        comment = self.widgets.get_widget("comment_label")
+        comment.set_text(theme.getComment())
+
+        self.config.write_preference_value("General", "theme", name.get_text())
+
+    def on_checkbutton_autostart_toggled(self, widget):
+        """Server Autostart checkbox toggled"""
+        self.config.write_preference_value("General", "start_server_auto",
+            widget.get_active())
+
+    def on_checkbutton_fullscreen_toggled(self, widget):
+        """Start in fullscreen checkbox toggled"""
+        self.config.write_preference_value("General", "start_in_fullscreen",
+            widget.get_active())
+
+    def on_checkbutton_systray_icon_toggled(self, widget):
+        """System Tray Icon checkbox toggled"""
+        self.config.write_preference_value("General", "display_icon",
+            widget.get_active())
+
+    def on_effect_checkbox_toggled(self, widget):
+        """Effect checkbox toggled"""
+        combobox = self.widgets.get_widget("effect_combobox")
+        combobox.set_sensitive(widget.get_active())
+        self.config.write_preference_value("General", "show_effects",
+            widget.get_active())
+
+    def on_effect_combobox_changed(self, widget):
+        """User changed effect for screen transitions"""
+        text = widget.get_active_text()
+        if text == _("No effect"):
+            english_text = "No effect"
+        if text == _("Crossfade"):
+            english_text = "Crossfade"
+        if text == _("Zoom and fade"):
+            english_text = "Zoom and fade"
+        if text == _("Slide"):
+            english_text = "Slide"
+        self.config.write_preference_value("General", "transition_effect",
+            english_text)
+
+    def on_spinbutton_slideshow_step_value_changed(self, widget):
+        """Activation of slideshow effects"""
+        self.config.write_preference_value("Photographs", "slideshow_step",
+            int(widget.get_value()))
+
+    def on_dialog_closed(self, widget, after):
+        """Callback function for dialog's close button"""
+        self.close()
+
+    def on_close_button_clicked(self, widget):
+        """Callback function for dialog's close button"""
+        self.close()
+
+    def close(self):
+        """Close Dialog"""
+        try:
+            proxy = MessageBusProxy(client_name = "Preferences GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.PREFERENCES_CONF_UPDATED))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                    None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, _(
+                        "Entertainer backend is not running. "
+                        "Config updates will happen on backend restart."
+                    ))
+            error.run()
+            error.destroy()
+
+
+        if(self.STAND_ALONE):
+            self.pref_dialog.hide()
+            self.pref_dialog.destroy()
+            gtk.main_quit()
+        else:
+            self.pref_dialog.hide()
+            self.pref_dialog.destroy()
+
+    def init_dialog_values_from_configure_file(self):
+        """Read configure file and set dialog widget values with read values.
+        """
+        self.load_themes()
+        current_theme = self.config.get_theme_name()
+
+        themelist_widget = self.widgets.get_widget("theme_list")
+        model = gtk.ListStore(str)
+
+        cell_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn("Themes", cell_renderer, text=0)
+        themelist_widget.append_column(column)
+
+        # Fill model with installed themes
+        for i in range(len(self.themes)):
+            model.insert(i, [self.themes[i]])
+
+        themelist_widget.set_model(model)
+
+        # Set current theme selected in theme list
+        index = model.get_iter_first()
+        unselected = True
+        index_counter = 0
+        while(unselected):
+            name = model.get_value(index, 0)
+            if name == current_theme:
+                unselected = False
+                themelist_widget.set_cursor(index_counter)
+            index = model.iter_next(index)
+            index_counter += 1
+
+        # Checkboxes
+        checkbutton_systray_icon = self.widgets.get_widget(
+            "checkbutton_systray_icon")
+        if self.config.tray_icon_enabled():
+            checkbutton_systray_icon.set_active(True)
+        else:
+            checkbutton_systray_icon.set_active(False)
+
+        checkbutton_autostart = self.widgets.get_widget("checkbutton_autostart")
+        if self.config.start_auto_server():
+            checkbutton_autostart.set_active(True)
+        else:
+            checkbutton_autostart.set_active(False)
+
+        checkbutton_fullscreen = self.widgets.get_widget(
+            "checkbutton_fullscreen")
+        if self.config.start_in_fullscreen():
+            checkbutton_fullscreen.set_active(True)
+        else:
+            checkbutton_fullscreen.set_active(False)
+
+        effect_checkbox = self.widgets.get_widget("effect_checkbox")
+        effect_combobox = self.widgets.get_widget("effect_combobox")
+        if self.config.show_effects():
+            effect_checkbox.set_active(True)
+            effect_combobox.set_sensitive(True)
+        else:
+            effect_checkbox.set_active(False)
+            effect_combobox.set_sensitive(False)
+
+        spinbutton_slideshow_step = self.widgets.get_widget(
+            "spinbutton_slideshow_step")
+        spinbutton_slideshow_step.set_value(self.config.get_slideshow_step())
+
+        # Set Effect Combobox value (Text values are set in glade file)
+        effect = self.config.transition_effect()
+        if effect == "No effect":
+            effect_combobox.set_active(0)
+        if effect == "Crossfade":
+            effect_combobox.set_active(1)
+        if effect == "Zoom and fade":
+            effect_combobox.set_active(2)
+        if effect == "Slide":
+            effect_combobox.set_active(3)
+

=== added file 'entertainerlib/download.py'
--- entertainerlib/download.py	1970-01-01 00:00:00 +0000
+++ entertainerlib/download.py	2009-05-06 04:46:51 +0000
@@ -0,0 +1,453 @@
+'''Downloader classes.'''
+
+__licence__ = "GPLv2"
+__copyright__ = "2009 Entertainer Developers"
+
+import locale
+import os
+import re
+import socket
+import threading
+import urllib
+from xml.dom import minidom
+
+import gobject
+
+# Amazon licence for Entertainer
+LICENSE_KEY = "1YCWYZ0SPPAJ27YZZ482"
+DEFAULT_LOCALE = "en_US"
+ASSOCIATE = "webservices-20"
+
+# We are not allowed to batch more than 2 requests at once
+# http://docs.amazonwebservices.com/AWSEcommerceService/4-0/
+# PgCombiningOperations.html
+MAX_BATCH_JOBS = 2
+
+
+class AlbumArtDownloader(threading.Thread):
+    """
+    Search and download album art from the internet.
+
+    This class is heavily based on Rhythmbox - AlbumArt plugin's class
+    'AmazonCoverArtSearch'. That plugin is released under GPLv2 (or higher)
+    and it's copyrights belong to Gareth Murphy and Martin Szulecki.
+
+    See more: http://www.gnome.org/projects/rhythmbox/
+
+    If you want better cover search, please contribute to Rhyhtmbox project.
+    """
+
+    def __init__(self, album, artist, art_file_path, callback = None):
+        """
+        Initialize album art downloader
+        @param album: Album title
+        @param artist: Artist name
+        @param art_file_path: Path where albumart is saved
+        @param callback: Callback function that is called after search if set
+        """
+        threading.Thread.__init__(self)
+        self.setName("AlbumArt Downloader")
+        self.callback_function = callback        # Callback function
+        self.album = album                       # Album title
+        self.artist = artist                     # Artist name
+        # Album art files are in this directory
+        self.path = art_file_path
+        (self.tld, self.encoding) = self.__get_locale ()
+
+    def run(self):
+        """Start searching and downloading albumart."""
+        self.search()
+
+    def __get_locale (self):
+        '''Get locale information from user\'s machine'''
+        # "JP is the only locale that correctly takes UTF8 input.
+        # All other locales use LATIN1."
+        # http://developer.amazonwebservices.com/connect/
+        # entry.jspa?externalID=1295&categoryID=117
+        supported_locales = {
+            "en_US" : ("com", "latin1"),
+            "en_GB" : ("co.uk", "latin1"),
+            "de" : ("de", "latin1"),
+            "ja" : ("jp", "utf8")
+        }
+
+        lc_id = DEFAULT_LOCALE
+        default = locale.getdefaultlocale ()[0]
+        if default:
+            if supported_locales.has_key (default):
+                lc_id = default
+            else:
+                lang = default.split("_")[0]
+                if supported_locales.has_key (lang):
+                    lc_id = lang
+
+        return supported_locales[lc_id]
+
+    def __valid_match (self, item):
+        '''Determine if item matches tag criteria'''
+        return (hasattr (item, "LargeImage") or hasattr (item, "MediumImage")) \
+               and hasattr (item, "ItemAttributes")
+
+    def __tidy_up_string (self, str_input):
+        """
+        Tidy up string. Remove spaces, convert to lowercase and replace chars.
+        """
+        # Lowercase
+        str_input = str_input.lower ()
+        # Strip
+        str_input = str_input.strip ()
+
+        # TODO: Convert accented to unaccented
+        str_input = str_input.replace (" - ", " ")
+        str_input = str_input.replace (": ", " ")
+        str_input = str_input.replace (" & ", " and ")
+
+        return str_input
+
+    def search(self):
+        """Search album art from Amazon"""
+        self.searching = True
+        self.cancel = False
+        self.keywords = []
+
+        st_artist = self.artist or u'Unknown'
+        st_album = self.album or u'Unknown'
+
+        if st_artist == st_album == u'Unknown':
+            self.on_search_completed (None)
+            return
+
+        # Tidy up
+
+        # Replace quote characters
+        # don't replace single quote: could be important punctuation
+        for char in ["\""]:
+            st_artist = st_artist.replace (char, '')
+            st_album = st_album.replace (char, '')
+
+
+        self.st_album = st_album
+        self.st_artist = st_artist
+
+        # Remove variants of Disc/CD [1-9] from album title before search
+        for exp in ["\([Dd]isc *[1-9]+\)", "\([Cc][Dd] *[1-9]+\)"]:
+            p = re.compile (exp)
+            st_album = p.sub ('', st_album)
+
+        st_album_no_vol = st_album
+        for exp in ["\(*[Vv]ol.*[1-9]+\)*"]:
+            p = re.compile (exp)
+            st_album_no_vol = p.sub ('', st_album_no_vol)
+
+        self.st_album_no_vol = st_album_no_vol
+
+        # Save current search's entry properties
+        self.search_album = st_album
+        self.search_artist = st_artist
+        self.search_album_no_vol = st_album_no_vol
+
+        # TODO: Improve to decrease wrong cover downloads, maybe add severity?
+        # Assemble list of search keywords (and thus search queries)
+        if st_album == u'Unknown':
+            self.keywords.append ("%s Best of" % (st_artist))
+            self.keywords.append ("%s Greatest Hits" % (st_artist))
+            self.keywords.append ("%s Essential" % (st_artist))
+            self.keywords.append ("%s Collection" % (st_artist))
+            self.keywords.append ("%s" % (st_artist))
+        elif st_artist == u'Unknown':
+            self.keywords.append ("%s" % (st_album))
+            if st_album_no_vol != st_artist:
+                self.keywords.append ("%s" % (st_album_no_vol))
+            self.keywords.append ("Various %s" % (st_album))
+        else:
+            if st_album != st_artist:
+                self.keywords.append ("%s %s" % (st_artist, st_album))
+                if st_album_no_vol != st_album:
+                    self.keywords.append ("%s %s" %
+                        (st_artist, st_album_no_vol))
+                self.keywords.append ("Various %s" % (st_album))
+            self.keywords.append ("%s" % (st_artist))
+
+        # Initiate asynchronous search
+        self.search_next ()
+
+    def search_next(self):
+        """Search again, because the last one didn't find any covers."""
+        if len (self.keywords) == 0:
+            # No keywords left to search -> no results
+            self.on_search_completed (None)
+            return False
+
+        self.searching = True
+
+        url = "http://ecs.amazonaws." + self.tld + "/onca/xml" \
+              "?Service=AWSECommerceService"                   \
+              "&AWSAccessKeyId=" + LICENSE_KEY +               \
+              "&AssociateTag=" + ASSOCIATE +                   \
+              "&ResponseGroup=Images,ItemAttributes"           \
+              "&Operation=ItemSearch"                          \
+              "&ItemSearch.Shared.SearchIndex=Music"
+
+        job = 1
+        while job <= MAX_BATCH_JOBS and len (self.keywords) > 0:
+            keyword = self.keywords.pop (0)
+            keyword = keyword.encode (self.encoding, "ignore")
+            keyword = keyword.strip ()
+            keyword = urllib.quote (keyword)
+            url += "&ItemSearch.%d.Keywords=%s" % (job, keyword)
+            job += 1
+
+        # Retrieve search for keyword
+        temp = urllib.urlopen(url)
+        search_results = temp.read()
+        self.on_search_response(search_results)
+        return True
+
+    def __unmarshal(self, element):
+        rc = object()
+        child_elements = [e for e in element.childNodes if isinstance (e,
+            minidom.Element)]
+        if child_elements:
+            for child in child_elements:
+                key = child.tagName
+                if hasattr (rc, key):
+                    if not isinstance (getattr (rc, key), list):
+                        setattr (rc, key, [getattr (rc, key)])
+                    getattr (rc, key).append (self.__unmarshal (child))
+                # get_best_match_urls() wants a list, even if there is only
+                # one item/artist
+                elif child.tagName in ("Items", "Item", "Artist"):
+                    setattr (rc, key, [self.__unmarshal(child)])
+                else:
+                    setattr (rc, key, self.__unmarshal(child))
+        else:
+            rc = "".join ([e.data for e in element.childNodes if isinstance (e,
+                minidom.Text)])
+        return rc
+
+    def on_search_response (self, result_data):
+        '''Check search results
+
+        If results are not good, we search again with the next keyword.
+        '''
+        if result_data is None:
+            self.search_next()
+            return
+
+        try:
+            xmldoc = minidom.parseString(result_data)
+        except (TypeError, AttributeError):
+            self.search_next()
+            return
+
+        data = self.__unmarshal (xmldoc)
+        if not hasattr (data, "ItemSearchResponse") or \
+           not hasattr (data.ItemSearchResponse, "Items"):
+            # Something went wrong ...
+            self.search_next ()
+        else:
+            # We got some search results
+            self.on_search_results (data.ItemSearchResponse.Items)
+
+    def on_search_results (self, results):
+        '''Results were found, now we need to take action.'''
+        self.on_search_completed (results)
+
+    def on_search_completed (self, result):
+        """
+        Search completed and results found.
+
+        Download large album art image from the first result and save it to
+        the disk. This function diverges greatly from the rhythmbox
+        implementation in order to avoid their loader and CoverArtDatabase
+        """
+        self.searching = False
+        image_urls = self.get_best_match_urls(result)
+        if len(image_urls) == 0:
+            return
+        image_url = image_urls[0]
+        image_file = urllib.urlopen(image_url)
+        # base64 encode artist and album so there can be a '/' in the artist
+        # or album
+        artist_album = self.artist + " - " + self.album
+        artist_album = artist_album.encode("base64")
+
+        dest = open(os.path.join(self.path, artist_album + ".jpg"),'w')
+        dest.write(image_file.read())
+        dest.close()
+
+        if self.callback_function is not None:
+            self.callback_function(self.artist, self.album)
+
+    def get_best_match_urls (self, search_results):
+        """Return tuple of URL's to large and medium cover of the best match"""
+        # Default to "no match", our results must match our criteria
+
+        # This code comes from Rhythmbox so we can't control the use of 'filter'
+        # pylint: disable-msg=W0141
+
+        if not search_results:
+            return []
+
+        best_match = None
+
+        for result in search_results:
+            if not hasattr (result, "Item"):
+                # Search was unsuccessful, try next batch job
+                continue
+
+            items = filter(self.__valid_match, result.Item)
+            if self.search_album != u'Unknown':
+                album_check = self.__tidy_up_string (self.search_album)
+                for item in items:
+                    if not hasattr (item.ItemAttributes, "Title"):
+                        continue
+
+                    album = self.__tidy_up_string (item.ItemAttributes.Title)
+                    if album == album_check:
+                        # Found exact album, can not get better than that
+                        best_match = item
+                        break
+                    # If we already found a best_match, just keep checking for
+                    # exact one. Check the results for both an album name that
+                    # contains the name we're searching for, and an album name
+                    # that's a substring of the name we're searching for
+                    elif (best_match is None) and \
+                         (album.find (album_check) != -1 or
+                          album_check.find (album) != -1):
+                        best_match = item
+
+            # If we still have no definite hit, use first result where artist
+            # matches
+            if (self.search_album == u'Unknown' and \
+                self.search_artist != u'Unknown'):
+                artist_check = self.__tidy_up_string (self.search_artist)
+                if best_match is None:
+                    # Check if artist appears in the Artists list
+                    hit = False
+                    for item in items:
+                        if not hasattr (item.ItemAttributes, "Artist"):
+                            continue
+
+                        for artist in item.ItemAttributes.Artist:
+                            artist = self.__tidy_up_string (artist)
+                            if artist.find (artist_check) != -1:
+                                best_match = item
+                                hit = True
+                                break
+                        if hit:
+                            break
+
+            urls = [getattr (best_match, size).URL for size in ("LargeImage",
+                "MediumImage")
+                    if hasattr (best_match, size)]
+            if urls:
+                return urls
+
+        # No search was successful
+        return []
+
+
+class LyricsDownloader(object):
+    """
+    Search and download song lyrics from the internet.
+    Update music cache if lyrics found.
+    """
+
+    # The permanent user ID from Lyricsfly
+    # NOTICE: This is the personal user ID for Entertainer, if you want to
+    # experiment with the API from lyricsfly you can get an ID here =>
+    # http://lyricsfly.com/api/, don't use this one as abuse of our key may
+    # invalidate it.
+    _LYRICSFLY_KEY = 'YzIxOTM4M2NkNGQ4MmRmODEtZW50ZXJ0YWluZXItcHJvamVjdC5jb20='
+
+    def __init__(self, title, artist, callback):
+        """
+        Initialize lyrics downloader.
+        @param title: Title of the track
+        @param artist: Artist of the track
+        @param callback: Callback function which is called when search is over.
+                   lyrics are given as a parameter to this callback function.
+        """
+        self.title = title.lower()
+        self.artist = artist.lower()
+        self.callback = callback
+
+    def search(self):
+        """
+        Search lyrics and download if found. Search is done asynchronously.
+        This method returns immediately and set callback is called when search
+        is over.
+        """
+        gobject.timeout_add(2000, self._async_search)
+
+    def _async_search(self):
+        """
+        Search lyrics and download if found
+        """
+        lyrics = ""
+        self._clean_up_artist_title()
+        lyrics_xml = self._get_lyrics_xml()
+        lyrics = self._parse_lyrics_xml(lyrics_xml)
+        self.callback(lyrics)
+
+    def _clean_up_artist_title(self):
+        """
+        Clean up the artist and title.
+        """
+        # Clean spaces
+        self.title = self.title.strip()
+        self.artist = self.artist.strip()
+
+        # Convert title and artist to use in url, special symbols have to be
+        # replaced by a '%' not '%xx'
+        # TODO: Find out what the special symbols are (', &, ...)
+        # not letters, digits, spaces and ()$^*=:;|#@}{][!,.-_\
+        self.artist = urllib.quote(self.artist.encode('utf-8'),
+                                   "'&()$^*=:;|#@}{][!,\\")
+        self.title = urllib.quote(self.title.encode('utf-8'),
+                                   "'&()$^*=:;|#@}{][!,\\")
+
+        self.artist = self.artist.replace("'", "%").replace("&", "%")
+        self.title = self.title.replace("'", "%").replace("&", "%")
+
+    def _get_lyrics_xml(self):
+        """
+        Download the lyrics XML-file.
+        """
+        lyrics_xml = None
+
+        # timeout in seconds
+        timeout = 5
+        socket.setdefaulttimeout(timeout)
+
+        url = "http://lyricsfly.com/api/api.php?i=%s&a=%s&t=%s" \
+            % (self._LYRICSFLY_KEY.decode('base64'), self.artist, self.title)
+        temp = urllib.urlopen(url)
+        lyrics_xml = temp.read()
+
+        return lyrics_xml
+
+    def _parse_lyrics_xml(self, lyrics_xml):
+        """Parse lyrics XML and return lyrics string"""
+        xmldoc = minidom.parseString(lyrics_xml).documentElement
+
+        # Get the lyric from the XML file
+        try:
+            lyrics = xmldoc.getElementsByTagName('tx')[0].firstChild.nodeValue
+        except IndexError:
+            return ''
+
+        # Clean spaces and enters
+        lyrics = lyrics.strip().replace('\n', '')
+        lyrics = lyrics.replace('[br]', '\n')
+
+        # Add the artist and title to the top of the lyric
+        lyrics = xmldoc.getElementsByTagName('ar')[0].firstChild.nodeValue + \
+        ' - ' + xmldoc.getElementsByTagName('tt')[0].firstChild.nodeValue + \
+        '\n\n' + lyrics
+
+        xmldoc.unlink()
+
+        return lyrics
+

=== renamed directory 'entertainerlib/utils/glade' => 'entertainerlib/glade'
=== modified file 'entertainerlib/glade/system_tray_icon_menu.glade'
--- entertainerlib/utils/glade/system_tray_icon_menu.glade	2008-08-16 04:28:47 +0000
+++ entertainerlib/glade/system_tray_icon_menu.glade	2009-04-30 01:11:22 +0000
@@ -6,12 +6,12 @@
     <property name="visible">True</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
-      <widget class="GtkImageMenuItem" id="menuitem_frontend">
+      <widget class="GtkImageMenuItem" id="menuitem_client">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="label" translatable="yes">Open media center GUI</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="on_menuitem_frontend_activate"/>
+        <signal name="activate" handler="on_menuitem_client_activate"/>
         <child internal-child="image">
           <widget class="GtkImage" id="menu-item-image3">
             <property name="visible">True</property>

=== renamed directory 'entertainerlib/frontend/gui' => 'entertainerlib/gui'
=== modified file 'entertainerlib/gui/screens/album.py'
--- entertainerlib/frontend/gui/screens/album.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/album.py	2009-05-05 03:31:34 +0000
@@ -8,13 +8,13 @@
 import clutter
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class Album(Screen):
     '''Screen that allows user to browse and play tracks of the music album.'''

=== modified file 'entertainerlib/gui/screens/artist.py'
--- entertainerlib/frontend/gui/screens/artist.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/artist.py	2009-05-05 03:31:34 +0000
@@ -6,11 +6,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
-from entertainerlib.frontend.gui.tabs.tracks_tab import TracksTab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.medialibrary.playlist import Playlist
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.albums_tab import AlbumsTab
+from entertainerlib.gui.tabs.tracks_tab import TracksTab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.client.medialibrary.playlist import Playlist
 
 class Artist(Screen):
     '''Screen that allows user to browse music by artist.'''

=== modified file 'entertainerlib/gui/screens/audio_play.py'
--- entertainerlib/frontend/gui/screens/audio_play.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/audio_play.py	2009-05-05 03:31:34 +0000
@@ -9,10 +9,10 @@
 import gobject
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.lyrics_tab import LyricsTab
-from entertainerlib.frontend.gui.tabs.playing_tab import PlayingTab
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.lyrics_tab import LyricsTab
+from entertainerlib.gui.tabs.playing_tab import PlayingTab
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
 
 class AudioPlay(Screen):

=== modified file 'entertainerlib/gui/screens/disc.py'
--- entertainerlib/frontend/gui/screens/disc.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/disc.py	2009-05-06 04:46:51 +0000
@@ -12,18 +12,18 @@
 import pango
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import (
     LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
-from entertainerlib.frontend.medialibrary.playlist import Playlist
-from entertainerlib.utils.albumart_downloader import AlbumArtDownloader
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.client.medialibrary.playlist import Playlist
+from entertainerlib.download import AlbumArtDownloader
 
 class Disc(Screen):
     '''Screen allows user to play tracks from the current Audio CD.'''

=== modified file 'entertainerlib/gui/screens/factory.py'
--- entertainerlib/frontend/gui/screens/factory.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/gui/screens/factory.py	2009-05-05 03:31:34 +0000
@@ -4,25 +4,25 @@
 __copyright__ = '2009, Matt Layman'
 __author__ = 'Matt Layman <[e-mail]>'
 
-from entertainerlib.frontend.gui.screens.artist import Artist
-from entertainerlib.frontend.gui.screens.album import Album
-from entertainerlib.frontend.gui.screens.audio_play import AudioPlay
-from entertainerlib.frontend.gui.screens.disc import Disc
-from entertainerlib.frontend.gui.screens.feed import Feed
-from entertainerlib.frontend.gui.screens.feed_entry import FeedEntry
-from entertainerlib.frontend.gui.screens.main import Main
-from entertainerlib.frontend.gui.screens.movie import Movie
-from entertainerlib.frontend.gui.screens.music import Music
-from entertainerlib.frontend.gui.screens.photo import Photo
-from entertainerlib.frontend.gui.screens.photo_albums import PhotoAlbums
-from entertainerlib.frontend.gui.screens.photographs import Photographs
-from entertainerlib.frontend.gui.screens.question import Question
-from entertainerlib.frontend.gui.screens.rss import Rss
-from entertainerlib.frontend.gui.screens.tv_episodes import TvEpisodes
-from entertainerlib.frontend.gui.screens.tv_series import TvSeries
-from entertainerlib.frontend.gui.screens.video import Video
-from entertainerlib.frontend.gui.screens.video_osd import VideoOSD
-from entertainerlib.frontend.gui.screens.weather import WeatherScreen
+from entertainerlib.gui.screens.artist import Artist
+from entertainerlib.gui.screens.album import Album
+from entertainerlib.gui.screens.audio_play import AudioPlay
+from entertainerlib.gui.screens.disc import Disc
+from entertainerlib.gui.screens.feed import Feed
+from entertainerlib.gui.screens.feed_entry import FeedEntry
+from entertainerlib.gui.screens.main import Main
+from entertainerlib.gui.screens.movie import Movie
+from entertainerlib.gui.screens.music import Music
+from entertainerlib.gui.screens.photo import Photo
+from entertainerlib.gui.screens.photo_albums import PhotoAlbums
+from entertainerlib.gui.screens.photographs import Photographs
+from entertainerlib.gui.screens.question import Question
+from entertainerlib.gui.screens.rss import Rss
+from entertainerlib.gui.screens.tv_episodes import TvEpisodes
+from entertainerlib.gui.screens.tv_series import TvSeries
+from entertainerlib.gui.screens.video import Video
+from entertainerlib.gui.screens.video_osd import VideoOSD
+from entertainerlib.gui.screens.weather import WeatherScreen
 
 class ScreenFactory(object):
     '''Generate a screen based on the type provided.'''

=== modified file 'entertainerlib/gui/screens/feed.py'
--- entertainerlib/frontend/gui/screens/feed.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/feed.py	2009-05-06 04:00:53 +0000
@@ -6,13 +6,13 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Feed(Screen):
     '''Screen is displayed when headlines are accessed for a specific feed.'''

=== modified file 'entertainerlib/gui/screens/feed_entry.py'
--- entertainerlib/frontend/gui/screens/feed_entry.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/feed_entry.py	2009-05-06 04:00:53 +0000
@@ -6,12 +6,12 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class FeedEntry(Screen):
     '''Screen displays one feed entry.'''

=== modified file 'entertainerlib/gui/screens/main.py'
--- entertainerlib/frontend/gui/screens/main.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/main.py	2009-05-06 04:15:18 +0000
@@ -4,17 +4,18 @@
 __copyright__ = "2007, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 
+import os
+
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.clock_label import ClockLabel
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_menu import ScrollMenu
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
-from entertainerlib.utils.cd_utils import eject_cd
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.clock_label import ClockLabel
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_menu import ScrollMenu
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Main(Screen):
     '''Screen displayed when frontend is opened and provides main navigation.'''
@@ -102,11 +103,11 @@
         item5 = Label(size, color, 0, 0, _("Headlines"), "rss")
         self.menu.add(item5)
 
-        if self.config.display_weather_in_frontend():
+        if self.config.display_weather_in_client():
             item6 = Label(size, color, 0, 0, _("Weather"), "weather")
             self.menu.add(item6)
 
-        if self.config.display_cd_eject_in_frontend():
+        if self.config.display_cd_eject_in_client():
             item7 = Label(size, color, 0, 0, _("Eject CD"), "eject_cd")
             self.menu.add(item7)
 
@@ -310,7 +311,7 @@
         elif item.get_name() == "weather":
             self.callback("weather")
         elif item.get_name() == "eject_cd":
-            eject_cd()
+            os.system('eject')
         elif item.get_name() == "photo":
             self.callback("photo_albums")
         elif item.get_name() == "rss":

=== modified file 'entertainerlib/gui/screens/movie.py'
--- entertainerlib/frontend/gui/screens/movie.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/movie.py	2009-05-05 03:31:34 +0000
@@ -8,15 +8,15 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class Movie(Screen):
     '''Screen contains information of one movie.'''

=== modified file 'entertainerlib/gui/screens/music.py'
--- entertainerlib/frontend/gui/screens/music.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/music.py	2009-05-05 03:31:34 +0000
@@ -4,12 +4,12 @@
 __copyright__ = "2007, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
-from entertainerlib.frontend.gui.tabs.artists_tab import ArtistsTab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.medialibrary.playlist import Playlist
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.albums_tab import AlbumsTab
+from entertainerlib.gui.tabs.artists_tab import ArtistsTab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.client.medialibrary.playlist import Playlist
 
 class Music(Screen):
     '''Screen that allows user to browse music library content.'''

=== modified file 'entertainerlib/gui/screens/photo.py'
--- entertainerlib/frontend/gui/screens/photo.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/photo.py	2009-05-05 03:31:34 +0000
@@ -7,9 +7,9 @@
 import clutter
 import gobject
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
 
 class Photo(Screen):
     '''Screen displays photograph in fullscreen and allows user to zoom in.'''

=== modified file 'entertainerlib/gui/screens/photo_albums.py'
--- entertainerlib/frontend/gui/screens/photo_albums.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/photo_albums.py	2009-05-05 03:31:34 +0000
@@ -9,14 +9,14 @@
 import gobject
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class PhotoAlbums(Screen):
     '''Screen contains a list of photo albums and album previews.'''

=== modified file 'entertainerlib/gui/screens/photographs.py'
--- entertainerlib/frontend/gui/screens/photographs.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/photographs.py	2009-05-05 03:31:34 +0000
@@ -8,14 +8,14 @@
 import clutter
 import gobject
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
-from entertainerlib.frontend.gui.widgets.loading_animation import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.image_menu_item import ImageMenuItem
+from entertainerlib.gui.widgets.loading_animation import (
     LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.texture import Texture
 
 class Photographs(Screen):
     '''Screen displays a grid of selectable photograph thumbnails.'''

=== modified file 'entertainerlib/gui/screens/question.py'
--- entertainerlib/frontend/gui/screens/question.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/question.py	2009-05-05 03:31:34 +0000
@@ -4,11 +4,11 @@
 __copyright__ = "2008, Teje Rodgers"
 __author__ = "Teje Rodgers <[e-mail]>"
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.transitions.transition import Transition
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.transitions.transition import Transition
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class Question(Screen):
     '''Screen is displayed when the application needs to ask a close ended

=== modified file 'entertainerlib/gui/screens/rss.py'
--- entertainerlib/frontend/gui/screens/rss.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/rss.py	2009-05-06 04:00:53 +0000
@@ -6,16 +6,16 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.menu import Menu
-from entertainerlib.frontend.gui.widgets.selector import Selector
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.medialibrary.feeds import Feed
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.menu import Menu
+from entertainerlib.gui.widgets.selector import Selector
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.client.medialibrary.feeds import Feed
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Rss(Screen):
     '''Screen displays RSS-feed titles and number of entries.'''

=== modified file 'entertainerlib/gui/screens/screen.py'
--- entertainerlib/frontend/gui/screens/screen.py	2009-04-30 01:16:33 +0000
+++ entertainerlib/gui/screens/screen.py	2009-05-05 03:31:34 +0000
@@ -9,9 +9,9 @@
 import clutter
 
 from entertainerlib.exceptions import ScreenException
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.tab_group import TabGroup
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.tab_group import TabGroup
 
 class Screen(Base, clutter.Group):
     """

=== modified file 'entertainerlib/gui/screens/tv_episodes.py'
--- entertainerlib/frontend/gui/screens/tv_episodes.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/tv_episodes.py	2009-05-05 03:31:34 +0000
@@ -7,15 +7,15 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class TvEpisodes(Screen):
     '''Screen contains list of all episodes of one specific season.'''

=== modified file 'entertainerlib/gui/screens/tv_series.py'
--- entertainerlib/frontend/gui/screens/tv_series.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/tv_series.py	2009-05-05 03:31:34 +0000
@@ -6,13 +6,13 @@
 
 import gtk
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class TvSeries(Screen):
     '''Screen that contains all seasons of one TV series.'''

=== modified file 'entertainerlib/gui/screens/video.py'
--- entertainerlib/frontend/gui/screens/video.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/video.py	2009-05-05 03:31:34 +0000
@@ -4,11 +4,11 @@
 __copyright__ = "2008, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.movies_tab import MoviesTab
-from entertainerlib.frontend.gui.tabs.series_tab import SeriesTab
-from entertainerlib.frontend.gui.tabs.video_clips_tab import VideoClipsTab
-from entertainerlib.frontend.gui.widgets.label import Label
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.movies_tab import MoviesTab
+from entertainerlib.gui.tabs.series_tab import SeriesTab
+from entertainerlib.gui.tabs.video_clips_tab import VideoClipsTab
+from entertainerlib.gui.widgets.label import Label
 
 class Video(Screen):
     '''Screen contains tabs for different video types in the video library.'''

=== modified file 'entertainerlib/gui/screens/video_osd.py'
--- entertainerlib/frontend/gui/screens/video_osd.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/video_osd.py	2009-05-05 03:31:34 +0000
@@ -7,11 +7,11 @@
 import gobject
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.progress_bar import ProgressBar
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.progress_bar import ProgressBar
+from entertainerlib.gui.widgets.texture import Texture
 
 class VideoOSD(Screen):
     '''Screen is displayed when video is being watched.

=== modified file 'entertainerlib/gui/screens/weather.py'
--- entertainerlib/frontend/gui/screens/weather.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/screens/weather.py	2009-05-06 05:10:14 +0000
@@ -4,10 +4,10 @@
 __copyright__ = "2008, Jamie Bennett"
 __author__ = "Jamie Bennett <[e-mail]>"
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.utils.weather import Weather
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.weather import Weather
 
 class WeatherScreen(Screen):
     '''Screen to display the user's set weather location.'''

=== renamed file 'entertainerlib/utils/system_tray_icon.py' => 'entertainerlib/gui/system_tray_icon.py'
--- entertainerlib/utils/system_tray_icon.py	2009-02-07 00:28:11 +0000
+++ entertainerlib/gui/system_tray_icon.py	2009-05-06 03:08:19 +0000
@@ -9,11 +9,10 @@
 import gtk
 import gtk.glade
 
-from entertainerlib.utils.log_viewer import LogViewer
-from entertainerlib.utils.preferences_dialog import PreferencesDialog
-from entertainerlib.utils.content_management_dialog import (
-    ContentManagementDialog)
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
+from entertainerlib.dialog import (ContentManagementDialog, LogViewer,
+    PreferencesDialog)
+
 
 class SystemTrayIcon:
     """Implements system tray icon for entertainer."""
@@ -43,8 +42,8 @@
             os.path.join(self.GLADE_DIR, "system_tray_icon_menu.glade"))
 
         # Bind menu signals
-        callback_dic = {"on_menuitem_frontend_activate"
-                        : self.on_menuitem_frontend_activate,
+        callback_dic = {"on_menuitem_client_activate"
+                        : self.on_menuitem_client_activate,
                         "on_menuitem_preferences_activate"
                         : self.on_menuitem_preferences_activate,
                         "on_menuitem_content_management_activate"
@@ -68,7 +67,7 @@
         self.icon_widget.connect('popup-menu', self.open_popup_menu)
 
     def systray_icon_activated(self, widget, data= None):
-        """Switch visibility of frontend when system tray icon is clicked"""
+        """Switch visibility of client when system tray icon is clicked"""
         self.toggle_interface_visibility_callback()
 
     def open_popup_menu(self, widget, button, time, data = None):
@@ -76,9 +75,9 @@
         self.popup.show_all()
         self.popup.popup(None, None, None, 3, time)
 
-    def on_menuitem_frontend_activate(self, widget):
-        """Execute frontend here if not running. Show if running"""
-        self.set_frontend_visible(True)
+    def on_menuitem_client_activate(self, widget):
+        """Execute client here if not running. Show if running"""
+        self.set_client_visible(True)
 
     def on_menuitem_preferences_activate(self, widget):
         """Executes preferences-tool."""

=== modified file 'entertainerlib/gui/tabs/albums_tab.py'
--- entertainerlib/frontend/gui/tabs/albums_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/albums_tab.py	2009-05-05 03:31:34 +0000
@@ -9,14 +9,14 @@
 import gobject
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.image_menu_item import ImageMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import (
     LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.texture import Texture
 
 class AlbumsTab(Tab):
     '''Tab to show album listings'''

=== modified file 'entertainerlib/gui/tabs/artists_tab.py'
--- entertainerlib/frontend/gui/tabs/artists_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/artists_tab.py	2009-05-05 03:31:34 +0000
@@ -9,13 +9,13 @@
 import gobject
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import (
     LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class ArtistsTab(Tab):
     '''Tab for the music screen to show artist listings'''

=== modified file 'entertainerlib/gui/tabs/lyrics_tab.py'
--- entertainerlib/frontend/gui/tabs/lyrics_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/lyrics_tab.py	2009-05-05 03:31:34 +0000
@@ -7,11 +7,11 @@
 import pango
 import clutter
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.loading_animation import (
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.loading_animation import (
     LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
 
 class LyricsTab(Tab):
     '''Tab for the audio play screen to show lyrics'''

=== modified file 'entertainerlib/gui/tabs/movies_tab.py'
--- entertainerlib/frontend/gui/tabs/movies_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/movies_tab.py	2009-05-05 03:31:34 +0000
@@ -8,13 +8,13 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.image_menu_item import ImageMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.rounded_texture import RoundedTexture
+from entertainerlib.gui.widgets.texture import Texture
 
 class MoviesTab(Tab):
     """

=== modified file 'entertainerlib/gui/tabs/playing_tab.py'
--- entertainerlib/frontend/gui/tabs/playing_tab.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/gui/tabs/playing_tab.py	2009-05-05 03:31:34 +0000
@@ -6,9 +6,9 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.progress_bar import ProgressBar
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.progress_bar import ProgressBar
 
 class PlayingTab(Tab):
     '''Tab for the audio play screen to show currently playing audio'''

=== modified file 'entertainerlib/gui/tabs/series_tab.py'
--- entertainerlib/frontend/gui/tabs/series_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/series_tab.py	2009-05-05 03:31:34 +0000
@@ -8,13 +8,13 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.image_menu_item import ImageMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.rounded_texture import RoundedTexture
+from entertainerlib.gui.widgets.texture import Texture
 
 class SeriesTab(Tab):
     """

=== modified file 'entertainerlib/gui/tabs/tab.py'
--- entertainerlib/frontend/gui/tabs/tab.py	2009-02-28 17:22:46 +0000
+++ entertainerlib/gui/tabs/tab.py	2009-05-05 03:31:34 +0000
@@ -6,10 +6,10 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
 
 class Tab(Base, clutter.Group):
     """

=== modified file 'entertainerlib/gui/tabs/tracks_tab.py'
--- entertainerlib/frontend/gui/tabs/tracks_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/tracks_tab.py	2009-05-05 03:31:34 +0000
@@ -7,11 +7,11 @@
 import clutter
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.text_menu_item import TextMenuItem
 
 class TracksTab(Tab):
     '''Tab for the artist screen to show track listings'''

=== modified file 'entertainerlib/gui/tabs/video_clips_tab.py'
--- entertainerlib/frontend/gui/tabs/video_clips_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/gui/tabs/video_clips_tab.py	2009-05-05 03:31:34 +0000
@@ -9,12 +9,12 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.image_menu_item import ImageMenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.rounded_texture import RoundedTexture
 
 class VideoClipsTab(Tab):
     """

=== renamed file 'entertainerlib/utils/theme.py' => 'entertainerlib/gui/theme.py'
=== modified file 'entertainerlib/gui/transitions/factory.py'
--- entertainerlib/frontend/gui/transitions/factory.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/gui/transitions/factory.py	2009-05-05 04:11:48 +0000
@@ -5,11 +5,11 @@
 __copyright__ = '2009, Matt Layman'
 __author__ = 'Matt Layman <[e-mail]>'
 
-from entertainerlib.frontend.gui.transitions.fade import Fade
-from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
-from entertainerlib.frontend.gui.transitions.slide import Slide
-from entertainerlib.frontend.gui.transitions.zoom_and_fade import ZoomAndFade
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.transitions.fade import Fade
+from entertainerlib.gui.transitions.no_effect import NoEffect
+from entertainerlib.gui.transitions.slide import Slide
+from entertainerlib.gui.transitions.zoom_and_fade import ZoomAndFade
+from entertainerlib.configuration import Configuration
 
 class TransitionFactory:
     '''Generates a transition object based on the configuration setting'''

=== modified file 'entertainerlib/gui/transitions/fade.py'
--- entertainerlib/frontend/gui/transitions/fade.py	2009-01-26 23:11:40 +0000
+++ entertainerlib/gui/transitions/fade.py	2009-05-05 03:31:34 +0000
@@ -5,7 +5,7 @@
 __author__ = "Lauri Taimila <[e-mail]>"
 
 import clutter
-from entertainerlib.frontend.gui.transitions.transition import Transition
+from entertainerlib.gui.transitions.transition import Transition
 
 class Fade(Transition):
     """

=== modified file 'entertainerlib/gui/transitions/no_effect.py'
--- entertainerlib/frontend/gui/transitions/no_effect.py	2009-01-26 23:11:40 +0000
+++ entertainerlib/gui/transitions/no_effect.py	2009-05-05 03:31:34 +0000
@@ -4,7 +4,7 @@
 __copyright__ = "2007, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 
-from entertainerlib.frontend.gui.transitions.transition import Transition
+from entertainerlib.gui.transitions.transition import Transition
 
 class NoEffect(Transition):
     """

=== modified file 'entertainerlib/gui/transitions/slide.py'
--- entertainerlib/frontend/gui/transitions/slide.py	2009-04-27 02:33:38 +0000
+++ entertainerlib/gui/transitions/slide.py	2009-05-05 04:11:48 +0000
@@ -6,8 +6,8 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.transitions.transition import Transition
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.transitions.transition import Transition
+from entertainerlib.configuration import Configuration
 
 class Slide(Transition):
     '''Move screens on and off the stage through horizontal movements.'''

=== modified file 'entertainerlib/gui/transitions/zoom_and_fade.py'
--- entertainerlib/frontend/gui/transitions/zoom_and_fade.py	2009-01-26 23:11:40 +0000
+++ entertainerlib/gui/transitions/zoom_and_fade.py	2009-05-05 03:31:34 +0000
@@ -5,7 +5,7 @@
 __author__ = "Lauri Taimila <[e-mail]>"
 
 import clutter
-from entertainerlib.frontend.gui.transitions.transition import Transition
+from entertainerlib.gui.transitions.transition import Transition
 
 class ZoomAndFade(Transition):
     """

=== modified file 'entertainerlib/gui/user_interface.py'
--- entertainerlib/frontend/gui/user_interface.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/gui/user_interface.py	2009-05-05 04:24:32 +0000
@@ -1,4 +1,4 @@
-'''UserInterface - Main window of the Entertainer frontend'''
+'''UserInterface - Main window of the Entertainer client'''
 
 # Clutter uses _1 to represent the 1 key and pylint complains about it
 # pylint: disable-msg=W0212
@@ -16,30 +16,30 @@
 import gobject
 import gtk
 
-from entertainerlib.frontend.gui.screen_history import ScreenHistory
-from entertainerlib.frontend.gui.screens.factory import ScreenFactory
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.transitions.factory import TransitionFactory
-from entertainerlib.frontend.gui.transitions.transition import Transition
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.menu_overlay import MenuOverlay
-from entertainerlib.frontend.media_player import MediaPlayer
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.gui.screen_history import ScreenHistory
+from entertainerlib.gui.screens.factory import ScreenFactory
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.transitions.factory import TransitionFactory
+from entertainerlib.gui.transitions.transition import Transition
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.menu_overlay import MenuOverlay
+from entertainerlib.client.media_player import MediaPlayer
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 class UserInterface:
     '''A main GUI window of the Entertainer client.'''
 
     def __init__(self, feed_library, image_library, music_library,
-        video_library, quit_frontend_callback):
-        self.quit_frontend_callback = quit_frontend_callback
+        video_library, quit_client_callback):
+        self.quit_client_callback = quit_client_callback
         self.config = Configuration()
 
         # Store the dimensions in case users want to return to window mode
         self.old_width = self.config.get_stage_width()
         self.old_height = self.config.get_stage_height()
 
-        self.logger = Logger().getLogger('frontend.gui.UserInterface')
+        self.logger = Logger().getLogger('client.gui.UserInterface')
 
         self.window = gtk.Window()
         self.window.connect('destroy', self.destroy_callback)
@@ -53,7 +53,7 @@
         except gobject.GError:
             # Must not be installed from a package, get icon from the branch
             file_dir = os.path.dirname(__file__)
-            icon_path = os.path.join(file_dir, '..', '..', '..', 'icons',
+            icon_path = os.path.join(file_dir, '..', '..', 'icons',
                 'hicolor', '48x48', 'apps', 'entertainer.png')
             icon = gtk.gdk.pixbuf_new_from_file(icon_path)
             self.window.set_icon(icon)
@@ -170,7 +170,7 @@
             UserEvent.PLAYER_SKIP_FORWARD : self._handle_player_skip_forward,
             UserEvent.PLAYER_PREVIOUS : self._handle_player_previous,
             UserEvent.PLAYER_NEXT : self._handle_player_next,
-            UserEvent.QUIT_FRONTEND : self._handle_quit_frontend
+            UserEvent.QUIT_FRONTEND : self._handle_quit_client
         }
 
         self.logger.debug("Frontend GUI initialized succesfully")
@@ -210,7 +210,7 @@
 
     def shutdown(self):
         '''Shut down the user interface.'''
-        self.quit_frontend_callback()
+        self.quit_client_callback()
 
     def _toggle_fullscreen(self):
         '''Set the User Interface to fullscreen mode or back to window mode.'''
@@ -384,7 +384,7 @@
         '''Handle UserEvent.TOGGLE_FULLSCREEN.'''
         self._toggle_fullscreen()
 
-    def _handle_quit_frontend(self, event):
+    def _handle_quit_client(self, event):
         '''Handle UserEvent.QUIT_FRONTEND.'''
         self.confirm_exit()
 

=== modified file 'entertainerlib/gui/widgets/base.py'
--- entertainerlib/frontend/gui/widgets/base.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/gui/widgets/base.py	2009-05-05 04:11:48 +0000
@@ -4,7 +4,7 @@
 __copyright__ = "2008, Matt Layman"
 __author__ = "Matt Layman <[e-mail]>"
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class Base(object):
     """Inherited class that allows for transforms from relative to absolute for

=== modified file 'entertainerlib/gui/widgets/clock_label.py'
--- entertainerlib/frontend/gui/widgets/clock_label.py	2008-11-29 22:44:32 +0000
+++ entertainerlib/gui/widgets/clock_label.py	2009-05-05 03:31:34 +0000
@@ -8,7 +8,7 @@
 import time
 import gobject
 
-from entertainerlib.frontend.gui.widgets.label import Label
+from entertainerlib.gui.widgets.label import Label
 
 class ClockLabel(Label):
     """Label that displays current time."""

=== modified file 'entertainerlib/gui/widgets/eyecandy_texture.py'
--- entertainerlib/frontend/gui/widgets/eyecandy_texture.py	2008-11-17 21:54:45 +0000
+++ entertainerlib/gui/widgets/eyecandy_texture.py	2009-05-05 03:31:34 +0000
@@ -5,8 +5,8 @@
 __author__ = "Lauri Taimila <[e-mail]>"
 
 import clutter
-from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture
-from entertainerlib.frontend.gui.widgets.reflection_texture import (
+from entertainerlib.gui.widgets.rounded_texture import RoundedTexture
+from entertainerlib.gui.widgets.reflection_texture import (
     ReflectionTexture)
 
 class EyeCandyTexture(clutter.Group):

=== modified file 'entertainerlib/gui/widgets/image_menu.py'
--- entertainerlib/frontend/gui/widgets/image_menu.py	2009-02-08 07:43:25 +0000
+++ entertainerlib/gui/widgets/image_menu.py	2009-05-05 04:11:48 +0000
@@ -6,8 +6,8 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.grid_menu import GridMenu
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.widgets.grid_menu import GridMenu
+from entertainerlib.configuration import Configuration
 
 class ImageMenu(GridMenu):
     """

=== modified file 'entertainerlib/gui/widgets/image_menu_item.py'
--- entertainerlib/frontend/gui/widgets/image_menu_item.py	2009-01-11 00:25:55 +0000
+++ entertainerlib/gui/widgets/image_menu_item.py	2009-05-05 03:31:34 +0000
@@ -5,7 +5,7 @@
 __author__ = ("Lauri Taimila <[e-mail]>",
               "Matt Layman <[e-mail]>")
 
-from entertainerlib.frontend.gui.widgets.menu_item import MenuItem
+from entertainerlib.gui.widgets.menu_item import MenuItem
 
 class ImageMenuItem(MenuItem):
     """

=== modified file 'entertainerlib/gui/widgets/label.py'
--- entertainerlib/frontend/gui/widgets/label.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/gui/widgets/label.py	2009-05-05 03:31:34 +0000
@@ -6,7 +6,7 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
+from entertainerlib.gui.widgets.base import Base
 
 class Label(Base, clutter.Label):
     """Wrapper of a clutter label to encapsulate some label settings and have

=== modified file 'entertainerlib/gui/widgets/list_indicator.py'
--- entertainerlib/frontend/gui/widgets/list_indicator.py	2008-11-17 21:53:05 +0000
+++ entertainerlib/gui/widgets/list_indicator.py	2009-05-05 04:11:48 +0000
@@ -6,9 +6,9 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.arrow_texture import ArrowTexture
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.widgets.arrow_texture import ArrowTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.configuration import Configuration
 
 class ListIndicator(clutter.Group):
     """

=== modified file 'entertainerlib/gui/widgets/menu_item.py'
--- entertainerlib/frontend/gui/widgets/menu_item.py	2009-01-11 00:25:55 +0000
+++ entertainerlib/gui/widgets/menu_item.py	2009-05-05 03:31:34 +0000
@@ -6,7 +6,7 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
+from entertainerlib.gui.widgets.base import Base
 
 class MenuItem(Base, clutter.Group):
     """

=== modified file 'entertainerlib/gui/widgets/menu_overlay.py'
--- entertainerlib/frontend/gui/widgets/menu_overlay.py	2008-11-17 11:20:47 +0000
+++ entertainerlib/gui/widgets/menu_overlay.py	2009-05-05 03:31:34 +0000
@@ -6,7 +6,7 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.texture import Texture
 
 class MenuOverlay(Texture):
     """

=== modified file 'entertainerlib/gui/widgets/scroll_area.py'
--- entertainerlib/frontend/gui/widgets/scroll_area.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/gui/widgets/scroll_area.py	2009-05-05 03:31:34 +0000
@@ -6,8 +6,8 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
 
 class ScrollArea(Base, clutter.Group):
     """Wrapper of a clutter Group that allows for scrolling. ScrollArea

=== modified file 'entertainerlib/gui/widgets/selector.py'
--- entertainerlib/frontend/gui/widgets/selector.py	2008-11-26 11:20:54 +0000
+++ entertainerlib/gui/widgets/selector.py	2009-05-05 03:31:34 +0000
@@ -6,7 +6,7 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.texture import Texture
 
 class Selector(clutter.Group):
     """

=== modified file 'entertainerlib/gui/widgets/tab_group.py'
--- entertainerlib/frontend/gui/widgets/tab_group.py	2009-02-27 00:01:53 +0000
+++ entertainerlib/gui/widgets/tab_group.py	2009-05-05 04:11:48 +0000
@@ -7,9 +7,9 @@
 import clutter
 import pango
 
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.configuration import Configuration
 
 class TabGroup(clutter.Group):
     """

=== modified file 'entertainerlib/gui/widgets/text_menu.py'
--- entertainerlib/frontend/gui/widgets/text_menu.py	2009-02-08 07:43:25 +0000
+++ entertainerlib/gui/widgets/text_menu.py	2009-05-05 03:31:34 +0000
@@ -4,8 +4,8 @@
 __copyright__ = "2007, Lauri Taimila"
 __author__ = "Lauri Taimila <[e-mail]>"
 
-from entertainerlib.frontend.gui.widgets.selector import Selector
-from entertainerlib.frontend.gui.widgets.grid_menu import GridMenu
+from entertainerlib.gui.widgets.selector import Selector
+from entertainerlib.gui.widgets.grid_menu import GridMenu
 
 class TextMenu(GridMenu):
     """

=== modified file 'entertainerlib/gui/widgets/text_menu_item.py'
--- entertainerlib/frontend/gui/widgets/text_menu_item.py	2008-11-25 23:20:28 +0000
+++ entertainerlib/gui/widgets/text_menu_item.py	2009-05-05 03:31:34 +0000
@@ -7,8 +7,8 @@
 import pango
 import clutter
 
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.menu_item import MenuItem
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.menu_item import MenuItem
 
 class TextMenuItem(MenuItem):
     """

=== modified file 'entertainerlib/gui/widgets/texture.py'
--- entertainerlib/frontend/gui/widgets/texture.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/gui/widgets/texture.py	2009-05-05 04:24:32 +0000
@@ -6,8 +6,8 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.utils.logger import Logger
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.logger import Logger
 
 class Texture(Base, clutter.Texture):
     """Wrapper of a clutter texture to encapsulate position settings and have
@@ -19,7 +19,7 @@
 
         Base.__init__(self)
         clutter.Texture.__init__(self, filename)
-        self.logger = Logger().getLogger('frontend.gui.widgets.Texture')
+        self.logger = Logger().getLogger('client.gui.widgets.Texture')
 
         self._position = None
         self._set_position((x_pos_percent, y_pos_percent))

=== renamed file 'entertainerlib/utils/logger.py' => 'entertainerlib/logger.py'
--- entertainerlib/utils/logger.py	2009-01-11 02:26:45 +0000
+++ entertainerlib/logger.py	2009-05-05 04:24:32 +0000
@@ -6,7 +6,7 @@
 
 import logging
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class Logger:
     '''Logger to record behind the scenes information.

=== modified file 'entertainerlib/network/__init__.py'
--- entertainerlib/network/__init__.py	2009-04-04 05:30:04 +0000
+++ entertainerlib/network/__init__.py	2009-04-30 01:11:22 +0000
@@ -26,7 +26,7 @@
 def client_main():
     '''Entertainer test client code.
 
-    This code will go away when what is now the frontend is made into a true
+    This code will go away when what is now the client is made into a true
     client.
     '''
     startLogging(sys.stdout)

=== modified file 'entertainerlib/tests/__init__.py'
--- entertainerlib/tests/__init__.py	2009-02-06 07:23:29 +0000
+++ entertainerlib/tests/__init__.py	2009-05-05 04:11:48 +0000
@@ -5,9 +5,9 @@
 from storm.locals import Store
 import testtools
 
-from entertainerlib.backend.core.db.connection import Database
-from entertainerlib.frontend.translation_setup import TranslationSetup
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.db.connection import Database
+from entertainerlib.client.translation_setup import TranslationSetup
+from entertainerlib.configuration import Configuration
 
 TranslationSetup()
 

=== modified file 'entertainerlib/tests/mock.py'
--- entertainerlib/tests/mock.py	2009-02-27 02:16:34 +0000
+++ entertainerlib/tests/mock.py	2009-04-30 01:11:22 +0000
@@ -1,23 +1,23 @@
 '''Test mock objects'''
 # pylint: disable-msg=W0231
 
-from entertainerlib.frontend.backend_connection import BackendConnection
-from entertainerlib.frontend.media_player import MediaPlayer
-from entertainerlib.frontend.medialibrary.feeds import Entry
-from entertainerlib.frontend.medialibrary.feeds import Feed
-from entertainerlib.frontend.medialibrary.feeds import FeedLibrary
-from entertainerlib.frontend.medialibrary.images import Image
-from entertainerlib.frontend.medialibrary.images import ImageLibrary
-from entertainerlib.frontend.medialibrary.music import Album
-from entertainerlib.frontend.medialibrary.music import MusicLibrary
-from entertainerlib.frontend.medialibrary.music import Track
-from entertainerlib.frontend.medialibrary.videos import Movie
-from entertainerlib.frontend.medialibrary.videos import TVEpisode
-from entertainerlib.frontend.medialibrary.videos import TVSeries
-from entertainerlib.frontend.medialibrary.videos import VideoLibrary
+from entertainerlib.client.backend_connection import BackendConnection
+from entertainerlib.client.media_player import MediaPlayer
+from entertainerlib.client.medialibrary.feeds import Entry
+from entertainerlib.client.medialibrary.feeds import Feed
+from entertainerlib.client.medialibrary.feeds import FeedLibrary
+from entertainerlib.client.medialibrary.images import Image
+from entertainerlib.client.medialibrary.images import ImageLibrary
+from entertainerlib.client.medialibrary.music import Album
+from entertainerlib.client.medialibrary.music import MusicLibrary
+from entertainerlib.client.medialibrary.music import Track
+from entertainerlib.client.medialibrary.videos import Movie
+from entertainerlib.client.medialibrary.videos import TVEpisode
+from entertainerlib.client.medialibrary.videos import TVSeries
+from entertainerlib.client.medialibrary.videos import VideoLibrary
 
 class MockAlbum(Album):
-    '''Mock entertainerlib.frontend.medialibrary.music.Album'''
+    '''Mock entertainerlib.client.medialibrary.music.Album'''
 
     def __init__(self, title=None, cursor=None, make_track=True):
         self.title = 'Ganging Up on the Sun'
@@ -43,7 +43,7 @@
 
 
 class MockBackendConnection(BackendConnection):
-    '''Mock entertainerlib.frontend.backend_connection.BackendConnection'''
+    '''Mock entertainerlib.client.backend_connection.BackendConnection'''
 
     def __init__(self):
         '''Override init to prevent BackenConnection from attempting to connect
@@ -67,7 +67,7 @@
 
 
 class MockEntry(Entry):
-    '''Mock entertainerlib.frontend.medialibrary.feeds.Entry'''
+    '''Mock entertainerlib.client.medialibrary.feeds.Entry'''
 
     def __init__(self, title=None, description=None, identifier=None,
         time=None, date=None, read=False):
@@ -81,7 +81,7 @@
 
 
 class MockFeed(Feed):
-    '''Mock entertainerlib.frontend.medialibrary.feeds.Feed'''
+    '''Mock entertainerlib.client.medialibrary.feeds.Feed'''
 
     def __init__(self, url=None):
         self.date = 'January 31st'
@@ -95,7 +95,7 @@
 
 
 class MockFeedLibrary(FeedLibrary):
-    '''Mock entertainerlib.frontend.medialibrary.feeds.FeedLibrary'''
+    '''Mock entertainerlib.client.medialibrary.feeds.FeedLibrary'''
 
     def __init__(self, backend_connection=None):
         '''Override the intial behavior.'''
@@ -106,7 +106,7 @@
 
 
 class MockImage(Image):
-    '''Mock entertainerlib.frontend.medialibrary.images.Image'''
+    '''Mock entertainerlib.client.medialibrary.images.Image'''
 
     def __init__(self, filename=None, album_path=None, title=None,
         description=None, date=None, time=None, width=None, height=None,
@@ -117,7 +117,7 @@
 
 
 class MockImageLibrary(ImageLibrary):
-    '''Mock entertainerlib.frontend.medialibrary.images.ImageLibrary'''
+    '''Mock entertainerlib.client.medialibrary.images.ImageLibrary'''
 
     def __init__(self, backend_connection=None):
         '''Override the intial behavior.'''
@@ -128,7 +128,7 @@
 
 
 class MockMediaPlayer(MediaPlayer):
-    '''Mock entertainerlib.frontend.media_player.MediaPlayer'''
+    '''Mock entertainerlib.client.media_player.MediaPlayer'''
 
     def __init__(self, stage=None, width=None, height=None):
         '''Override any actual media player set up.'''
@@ -149,7 +149,7 @@
 
 
 class MockMovie(Movie):
-    '''Mock entertainerlib.frontend.medialibrary.videos.Movie'''
+    '''Mock entertainerlib.client.medialibrary.videos.Movie'''
 
     def __init__(self, filename=None):
         '''Override init to prevent a database connection'''
@@ -195,7 +195,7 @@
         return False
 
 class MockMusicLibrary(MusicLibrary):
-    '''Mock entertainerlib.frontend.medialibrary.music.MusicLibrary'''
+    '''Mock entertainerlib.client.medialibrary.music.MusicLibrary'''
 
     def __init__(self, backend_connection=None):
         '''Override the intial behavior.'''
@@ -222,7 +222,7 @@
 
 
 class MockTVEpisode(TVEpisode):
-    '''Mock entertainerlib.frontend.medialibrary.videos.TVEpisode'''
+    '''Mock entertainerlib.client.medialibrary.videos.TVEpisode'''
 
     def __init__(self, title=None):
         '''Override init to prevent a database connection'''
@@ -245,7 +245,7 @@
 
 
 class MockTVSeries(TVSeries):
-    '''Mock entertainerlib.frontend.medialibrary.videos.TVSeries'''
+    '''Mock entertainerlib.client.medialibrary.videos.TVSeries'''
 
     def __init__(self, title=None):
         '''Override init to prevent a database connection'''
@@ -268,7 +268,7 @@
         return False
 
 class MockTrack(Track):
-    '''Mock entertainerlib.frontend.medialibrary.music.Track'''
+    '''Mock entertainerlib.client.medialibrary.music.Track'''
 
     def __init__(self, filename=None, title=None, tracknumber=None, artist=None,
         album=None, genre=None, bitrate=None, year=None, rating=None,
@@ -287,7 +287,7 @@
 
 
 class MockVideoLibrary(VideoLibrary):
-    '''Mock entertainerlib.frontend.medialibrary.videos.VideoLibrary'''
+    '''Mock entertainerlib.client.medialibrary.videos.VideoLibrary'''
 
     def __init__(self, backend_connection=None):
         '''Override the intial behavior.'''

=== modified file 'entertainerlib/tests/test_base.py'
--- entertainerlib/tests/test_base.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/tests/test_base.py	2009-05-05 03:31:34 +0000
@@ -4,11 +4,11 @@
 __copyright__ = "2008, Matt Layman"
 __author__ = "Matt Layman <[e-mail]>"
 
-from entertainerlib.frontend.gui.widgets.base import Base
+from entertainerlib.gui.widgets.base import Base
 from entertainerlib.tests import EntertainerTest
 
 class BaseTest(EntertainerTest):
-    """Test for entertainerlib.frontend.gui.widgets.base"""
+    """Test for entertainerlib.gui.widgets.base"""
 
     def setUp(self):
         """Set up the test"""

=== modified file 'entertainerlib/tests/test_configuration.py'
--- entertainerlib/tests/test_configuration.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/tests/test_configuration.py	2009-05-05 04:11:48 +0000
@@ -8,7 +8,7 @@
 import os
 
 from entertainerlib.tests import EntertainerTest
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class ConfigurationTest(EntertainerTest):
     '''Test for utils.configuration'''

=== modified file 'entertainerlib/tests/test_database.py'
--- entertainerlib/tests/test_database.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_database.py	2009-05-05 03:35:28 +0000
@@ -8,7 +8,7 @@
 
 from storm.locals import Store
 
-from entertainerlib.backend.core.db.connection import Database, SCHEMA
+from entertainerlib.db.connection import Database, SCHEMA
 from entertainerlib.tests import EntertainerTestWithDatabase
 
 class DatabaseTest(EntertainerTestWithDatabase):

=== modified file 'entertainerlib/tests/test_feedconfigtools.py'
--- entertainerlib/tests/test_feedconfigtools.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/tests/test_feedconfigtools.py	2009-05-06 04:00:53 +0000
@@ -9,14 +9,17 @@
 import gtk
 import gtk.glade
 
-from entertainerlib.utils.feed_utils import FeedConfigTools
+from entertainerlib.backend.components.feeds.feed_utils import FeedConfigTools
 from entertainerlib.tests import EntertainerTest
 
 THIS_DIR = os.path.dirname(__file__)
 
 
 class FeedConfigToolsTest(EntertainerTest):
-    '''Test for entertainerlib.utils.feed_utils FeedConfigTools'''
+    # pylint: disable-msg=C0301
+    # This pylint warning can be removed when the backend stuff gets removed,
+    # and the pieces we keep get rearranged.
+    '''Test for entertainerlib.backend.components.feeds.feed_utils.FeedConfigTools'''
 
     def setUp(self):
         """Sets up everything for the test"""

=== modified file 'entertainerlib/tests/test_feedentryparser.py'
--- entertainerlib/tests/test_feedentryparser.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/tests/test_feedentryparser.py	2009-05-06 04:00:53 +0000
@@ -7,7 +7,7 @@
 
 import unittest
 
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 
 class FeedEntryParserTest(unittest.TestCase):

=== modified file 'entertainerlib/tests/test_frontendfeed.py'
--- entertainerlib/tests/test_frontendfeed.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_frontendfeed.py	2009-04-30 01:11:22 +0000
@@ -1,4 +1,4 @@
-'''Tests feeds from the frontend'''
+'''Tests feeds from the client'''
 
 __licence__ = "GPLv2"
 __copyright__ = "2008, Joshua Scotton"
@@ -6,11 +6,11 @@
 
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.frontend.medialibrary.feeds import Feed
+from entertainerlib.client.medialibrary.feeds import Feed
 from entertainerlib.tests import EntertainerTest
 
 class FrontendFeedTest(EntertainerTest):
-    '''Test reading feeds from the frontend'''
+    '''Test reading feeds from the client'''
 
     def setUp(self):
         """Sets up everything for the test"""

=== modified file 'entertainerlib/tests/test_frontendfeedentry.py'
--- entertainerlib/tests/test_frontendfeedentry.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_frontendfeedentry.py	2009-04-30 01:11:22 +0000
@@ -1,4 +1,4 @@
-'''Tests feed entries on the frontend'''
+'''Tests feed entries on the client'''
 # pylint: disable-msg=W0212
 
 __licence__ = "GPLv2"
@@ -7,11 +7,11 @@
 
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.frontend.medialibrary.feeds import Feed, Entry
+from entertainerlib.client.medialibrary.feeds import Feed, Entry
 from entertainerlib.tests import EntertainerTest
 
 class FrontendFeedEntryTest(EntertainerTest):
-    '''Tests feed entries on the frontend'''
+    '''Tests feed entries on the client'''
 
     entry_title = "Test Entry"
     entry_desc = "This is a test description"

=== modified file 'entertainerlib/tests/test_frontendfeedlibrary.py'
--- entertainerlib/tests/test_frontendfeedlibrary.py	2009-02-04 04:17:37 +0000
+++ entertainerlib/tests/test_frontendfeedlibrary.py	2009-04-30 01:11:22 +0000
@@ -1,4 +1,4 @@
-'''Tests feed library from the frontend'''
+'''Tests feed library from the client'''
 
 __licence__ = "GPLv2"
 __copyright__ = "2008, Joshua Scotton"
@@ -6,13 +6,13 @@
 
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.frontend.medialibrary.feeds import FeedLibrary
+from entertainerlib.client.medialibrary.feeds import FeedLibrary
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.tests.mock import MockBackendConnection
 
 class FrontendFeedLibraryTest(EntertainerTest):
     """
-    Tests the frontend.medialibrary.feeds.FeedLibrary object
+    Tests the client.medialibrary.feeds.FeedLibrary object
     @todo comment tests
     @todo the test database doesn't seem to be working
     """

=== modified file 'entertainerlib/tests/test_imagemenuitem.py'
--- entertainerlib/tests/test_imagemenuitem.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_imagemenuitem.py	2009-05-05 03:31:34 +0000
@@ -7,14 +7,14 @@
 
 import os
 
-from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.image_menu_item import ImageMenuItem
+from entertainerlib.gui.widgets.texture import Texture
 from entertainerlib.tests import EntertainerTest
 
 THIS_DIR = os.path.dirname(__file__)
 
 class ImageMenuItemTest(EntertainerTest):
-    """Test for entertainerlib.frontend.gui.widgets.image_menu_item"""
+    """Test for entertainerlib.gui.widgets.image_menu_item"""
 
     def setUp(self):
         """Set up the test"""

=== modified file 'entertainerlib/tests/test_label.py'
--- entertainerlib/tests/test_label.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_label.py	2009-05-05 03:31:34 +0000
@@ -7,12 +7,12 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.label import Label
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.label import Label
 from entertainerlib.tests import EntertainerTest
 
 class LabelTest(EntertainerTest):
-    """Test for entertainerlib.frontend.gui.widgets.label"""
+    """Test for entertainerlib.gui.widgets.label"""
 
     def setUp(self):
         """Set up the test"""

=== modified file 'entertainerlib/tests/test_logger.py'
--- entertainerlib/tests/test_logger.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_logger.py	2009-05-05 04:24:32 +0000
@@ -7,7 +7,7 @@
 import logging
 
 from entertainerlib.tests import EntertainerTest
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 class TestLogger(EntertainerTest):
     '''Logger test case'''

=== modified file 'entertainerlib/tests/test_lyricsdownloader.py'
--- entertainerlib/tests/test_lyricsdownloader.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_lyricsdownloader.py	2009-05-06 04:46:51 +0000
@@ -9,7 +9,7 @@
 import os
 import urllib
 
-from entertainerlib.utils.lyrics_downloader import LyricsDownloader
+from entertainerlib.download import LyricsDownloader
 
 THIS_DIR = os.path.dirname(__file__)
 

=== modified file 'entertainerlib/tests/test_models.py'
--- entertainerlib/tests/test_models.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_models.py	2009-05-05 03:35:28 +0000
@@ -6,7 +6,7 @@
 
 from storm.locals import Store
 
-from entertainerlib.backend.core.db import models
+from entertainerlib.db import models
 from entertainerlib.tests import EntertainerTestWithDatabase
 
 

=== modified file 'entertainerlib/tests/test_music.py'
--- entertainerlib/tests/test_music.py	2009-02-14 15:26:32 +0000
+++ entertainerlib/tests/test_music.py	2009-04-30 01:11:22 +0000
@@ -8,11 +8,11 @@
 
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.frontend.medialibrary.music import (
+from entertainerlib.client.medialibrary.music import (
     Album, AlbumHasNoTracks, MusicLibrary, Track, CompactDisc,
     TrackRatingOutOfRange, TrackTypeError)
 from entertainerlib.tests.mock import MockBackendConnection
-from entertainerlib.frontend.medialibrary.playable import Playable
+from entertainerlib.client.medialibrary.playable import Playable
 from entertainerlib.tests import EntertainerTest
 
 class TestMusic(EntertainerTest):

=== modified file 'entertainerlib/tests/test_opmlparser.py'
--- entertainerlib/tests/test_opmlparser.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/tests/test_opmlparser.py	2009-05-06 04:00:53 +0000
@@ -9,7 +9,7 @@
 import os
 import xml.parsers.expat
 
-from entertainerlib.utils.feed_utils import OPMLParser
+from entertainerlib.backend.components.feeds.feed_utils import OPMLParser
 
 THIS_DIR = os.path.dirname(__file__)
 

=== modified file 'entertainerlib/tests/test_screen.py'
--- entertainerlib/tests/test_screen.py	2009-04-27 23:12:40 +0000
+++ entertainerlib/tests/test_screen.py	2009-05-05 03:31:34 +0000
@@ -7,15 +7,15 @@
 import clutter
 
 from entertainerlib.exceptions import ScreenException
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.tab_group import TabGroup
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.tab_group import TabGroup
 from entertainerlib.tests import EntertainerTest
 
 class ScreenTest(EntertainerTest):
-    '''Test for entertainerlib.frontend.gui.screens.screen'''
+    """Test for entertainerlib.gui.screens.screen"""
 
     def setUp(self):
         '''Set up the test.'''

=== modified file 'entertainerlib/tests/test_screenfactory.py'
--- entertainerlib/tests/test_screenfactory.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_screenfactory.py	2009-05-05 03:31:34 +0000
@@ -7,26 +7,26 @@
 
 import os
 
-from entertainerlib.frontend.gui.screens.album import Album
-from entertainerlib.frontend.gui.screens.artist import Artist
-from entertainerlib.frontend.gui.screens.audio_play import AudioPlay
-from entertainerlib.frontend.gui.screens.disc import Disc
-from entertainerlib.frontend.gui.screens.factory import ScreenFactory
-from entertainerlib.frontend.gui.screens.feed import Feed
-from entertainerlib.frontend.gui.screens.feed_entry import FeedEntry
-from entertainerlib.frontend.gui.screens.main import Main
-from entertainerlib.frontend.gui.screens.movie import Movie
-from entertainerlib.frontend.gui.screens.music import Music
-from entertainerlib.frontend.gui.screens.photo import Photo
-from entertainerlib.frontend.gui.screens.photo_albums import PhotoAlbums
-from entertainerlib.frontend.gui.screens.photographs import Photographs
-from entertainerlib.frontend.gui.screens.question import Question
-from entertainerlib.frontend.gui.screens.rss import Rss
-from entertainerlib.frontend.gui.screens.tv_episodes import TvEpisodes
-from entertainerlib.frontend.gui.screens.tv_series import TvSeries
-from entertainerlib.frontend.gui.screens.video_osd import VideoOSD
-from entertainerlib.frontend.gui.screens.video import Video
-from entertainerlib.frontend.gui.screens.weather import WeatherScreen
+from entertainerlib.gui.screens.album import Album
+from entertainerlib.gui.screens.artist import Artist
+from entertainerlib.gui.screens.audio_play import AudioPlay
+from entertainerlib.gui.screens.disc import Disc
+from entertainerlib.gui.screens.factory import ScreenFactory
+from entertainerlib.gui.screens.feed import Feed
+from entertainerlib.gui.screens.feed_entry import FeedEntry
+from entertainerlib.gui.screens.main import Main
+from entertainerlib.gui.screens.movie import Movie
+from entertainerlib.gui.screens.music import Music
+from entertainerlib.gui.screens.photo import Photo
+from entertainerlib.gui.screens.photo_albums import PhotoAlbums
+from entertainerlib.gui.screens.photographs import Photographs
+from entertainerlib.gui.screens.question import Question
+from entertainerlib.gui.screens.rss import Rss
+from entertainerlib.gui.screens.tv_episodes import TvEpisodes
+from entertainerlib.gui.screens.tv_series import TvSeries
+from entertainerlib.gui.screens.video_osd import VideoOSD
+from entertainerlib.gui.screens.video import Video
+from entertainerlib.gui.screens.weather import WeatherScreen
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.tests.mock import MockAlbum
 from entertainerlib.tests.mock import MockEntry
@@ -43,7 +43,7 @@
 
 
 class ScreenFactoryTest(EntertainerTest):
-    '''Test for entertainerlib.frontend.gui.screens.factory'''
+    '''Test for entertainerlib.gui.screens.factory'''
 
     def setUp(self):
         EntertainerTest.setUp(self)

=== modified file 'entertainerlib/tests/test_scrollarea.py'
--- entertainerlib/tests/test_scrollarea.py	2009-02-06 08:13:48 +0000
+++ entertainerlib/tests/test_scrollarea.py	2009-05-05 03:31:34 +0000
@@ -6,13 +6,13 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
 from entertainerlib.tests import EntertainerTest
 
 class ScrollAreaTest(EntertainerTest):
-    """Test for entertainerlib.frontend.gui.widgets.scroll_area"""
+    """Test for entertainerlib.gui.widgets.scroll_area"""
 
     def setUp(self):
         """Set up the test"""

=== modified file 'entertainerlib/tests/test_texture.py'
--- entertainerlib/tests/test_texture.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_texture.py	2009-05-05 03:31:34 +0000
@@ -9,14 +9,14 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.texture import Texture
 from entertainerlib.tests import EntertainerTest
 
 THIS_DIR = os.path.dirname(__file__)
 
 class TextureTest(EntertainerTest):
-    """Test for entertainerlib.frontend.gui.widgets.texture"""
+    """Test for entertainerlib.gui.widgets.texture"""
 
     def setUp(self):
         """Set up the test"""

=== modified file 'entertainerlib/tests/test_theme.py'
--- entertainerlib/tests/test_theme.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_theme.py	2009-05-05 04:17:21 +0000
@@ -5,10 +5,10 @@
 __author__ = "Matt Layman <[e-mail]>"
 
 from entertainerlib.tests import EntertainerTest
-from entertainerlib.utils.theme import Theme
+from entertainerlib.gui.theme import Theme
 
 class ThemeTest(EntertainerTest):
-    """Test for entertainerlib.utils.theme"""
+    """Test for entertainerlib.gui.theme"""
 
     def setUp(self):
         """Set up the test"""

=== modified file 'entertainerlib/tests/test_transitionfactory.py'
--- entertainerlib/tests/test_transitionfactory.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/tests/test_transitionfactory.py	2009-05-05 03:31:34 +0000
@@ -5,15 +5,15 @@
 __copyright__ = '2009, Matt Layman'
 __author__ = 'Matt Layman <[e-mail]>'
 
-from entertainerlib.frontend.gui.transitions.factory import TransitionFactory
-from entertainerlib.frontend.gui.transitions.fade import Fade
-from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
-from entertainerlib.frontend.gui.transitions.slide import Slide
-from entertainerlib.frontend.gui.transitions.zoom_and_fade import ZoomAndFade
+from entertainerlib.gui.transitions.factory import TransitionFactory
+from entertainerlib.gui.transitions.fade import Fade
+from entertainerlib.gui.transitions.no_effect import NoEffect
+from entertainerlib.gui.transitions.slide import Slide
+from entertainerlib.gui.transitions.zoom_and_fade import ZoomAndFade
 from entertainerlib.tests import EntertainerTest
 
 class TransitionFactoryTest(EntertainerTest):
-    '''Test for entertainerlib.frontend.gui.transitions.factory'''
+    '''Test for entertainerlib.gui.transitions.factory'''
 
     def setUp(self):
         '''Set up the test'''

=== modified file 'entertainerlib/tests/test_userinterface.py'
--- entertainerlib/tests/test_userinterface.py	2009-04-27 23:12:40 +0000
+++ entertainerlib/tests/test_userinterface.py	2009-05-05 03:31:34 +0000
@@ -6,14 +6,14 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.screens.question import Question
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.user_interface import UserInterface
+from entertainerlib.gui.screens.question import Question
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.user_interface import UserInterface
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.tests.mock import MockClutterKeyboardEvent
 
 class UserInterfaceTest(EntertainerTest):
-    '''Test for entertainerlib.frontend.gui.user_interface'''
+    '''Test for entertainerlib.gui.user_interface'''
 
     def setUp(self):
         EntertainerTest.setUp(self)

=== modified file 'entertainerlib/tests/test_weather.py'
--- entertainerlib/tests/test_weather.py	2009-02-10 00:59:03 +0000
+++ entertainerlib/tests/test_weather.py	2009-05-06 05:10:14 +0000
@@ -7,7 +7,7 @@
 from datetime import datetime
 
 from entertainerlib.tests import EntertainerTest
-from entertainerlib.utils.weather import Weather
+from entertainerlib.weather import Weather
 
 class WeatherTest(EntertainerTest):
     """

=== modified file 'entertainerlib/thumbnailer.py'
--- entertainerlib/thumbnailer.py	2009-02-19 14:25:51 +0000
+++ entertainerlib/thumbnailer.py	2009-05-05 04:11:48 +0000
@@ -17,7 +17,7 @@
 
 from entertainerlib.exceptions import (ImageThumbnailerException,
     ThumbnailerException, VideoThumbnailerException)
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 
 class Thumbnailer(object):

=== removed directory 'entertainerlib/utils'
=== removed file 'entertainerlib/utils/__init__.py'
--- entertainerlib/utils/__init__.py	2008-08-07 01:17:29 +0000
+++ entertainerlib/utils/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-'''Entertainer utils'''

=== removed file 'entertainerlib/utils/albumart_downloader.py'
--- entertainerlib/utils/albumart_downloader.py	2009-03-22 04:53:10 +0000
+++ entertainerlib/utils/albumart_downloader.py	1970-01-01 00:00:00 +0000
@@ -1,353 +0,0 @@
-'''AlbumArtDownloader - Search and download album art from the internet.'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila, "
-__copyright__ += "2008, Matt Layman"
-__author__ = "Lauri Taimila <[e-mail]>, "
-__author__ += "Matt Layman <[e-mail]"
-
-import os
-import re
-import locale
-import urllib
-import threading
-from xml.dom import minidom
-
-# Amazon licence for Entertainer
-LICENSE_KEY = "1YCWYZ0SPPAJ27YZZ482"
-DEFAULT_LOCALE = "en_US"
-ASSOCIATE = "webservices-20"
-
-# We are not allowed to batch more than 2 requests at once
-# http://docs.amazonwebservices.com/AWSEcommerceService/4-0/
-# PgCombiningOperations.html
-MAX_BATCH_JOBS = 2
-
-class Bag:
-    '''Just a helper'''
-
-
-class AlbumArtDownloader(threading.Thread):
-    """
-    Search and download album art from the internet.
-
-    This class is heavily based on Rhythmbox - AlbumArt plugin's class
-    'AmazonCoverArtSearch'. That plugin is released under GPLv2 (or higher)
-    and it's copyrights belong to Gareth Murphy and Martin Szulecki.
-
-    See more: http://www.gnome.org/projects/rhythmbox/
-
-    If you want better cover search, please contribute to Rhyhtmbox project.
-    """
-
-    def __init__(self, album, artist, art_file_path, callback = None):
-        """
-        Initialize album art downloader
-        @param album: Album title
-        @param artist: Artist name
-        @param art_file_path: Path where albumart is saved
-        @param callback: Callback function that is called after search if set
-        """
-        threading.Thread.__init__(self)
-        self.setName("AlbumArt Downloader")
-        self.callback_function = callback        # Callback function
-        self.album = album                       # Album title
-        self.artist = artist                     # Artist name
-        # Album art files are in this directory
-        self.path = art_file_path
-        (self.tld, self.encoding) = self.__get_locale ()
-
-    def run(self):
-        """Start searching and downloading albumart."""
-        self.search()
-
-    def __get_locale (self):
-        '''Get locale information from user\'s machine'''
-        # "JP is the only locale that correctly takes UTF8 input.
-        # All other locales use LATIN1."
-        # http://developer.amazonwebservices.com/connect/
-        # entry.jspa?externalID=1295&categoryID=117
-        supported_locales = {
-            "en_US" : ("com", "latin1"),
-            "en_GB" : ("co.uk", "latin1"),
-            "de" : ("de", "latin1"),
-            "ja" : ("jp", "utf8")
-        }
-
-        lc_id = DEFAULT_LOCALE
-        default = locale.getdefaultlocale ()[0]
-        if default:
-            if supported_locales.has_key (default):
-                lc_id = default
-            else:
-                lang = default.split("_")[0]
-                if supported_locales.has_key (lang):
-                    lc_id = lang
-
-        return supported_locales[lc_id]
-
-    def __valid_match (self, item):
-        '''Determine if item matches tag criteria'''
-        return (hasattr (item, "LargeImage") or hasattr (item, "MediumImage")) \
-               and hasattr (item, "ItemAttributes")
-
-    def __tidy_up_string (self, str_input):
-        """
-        Tidy up string. Remove spaces, convert to lowercase and replace chars.
-        """
-        # Lowercase
-        str_input = str_input.lower ()
-        # Strip
-        str_input = str_input.strip ()
-
-        # TODO: Convert accented to unaccented
-        str_input = str_input.replace (" - ", " ")
-        str_input = str_input.replace (": ", " ")
-        str_input = str_input.replace (" & ", " and ")
-
-        return str_input
-
-    def search(self):
-        """Search album art from Amazon"""
-        self.searching = True
-        self.cancel = False
-        self.keywords = []
-
-        st_artist = self.artist or u'Unknown'
-        st_album = self.album or u'Unknown'
-
-        if st_artist == st_album == u'Unknown':
-            self.on_search_completed (None)
-            return
-
-        # Tidy up
-
-        # Replace quote characters
-        # don't replace single quote: could be important punctuation
-        for char in ["\""]:
-            st_artist = st_artist.replace (char, '')
-            st_album = st_album.replace (char, '')
-
-
-        self.st_album = st_album
-        self.st_artist = st_artist
-
-        # Remove variants of Disc/CD [1-9] from album title before search
-        for exp in ["\([Dd]isc *[1-9]+\)", "\([Cc][Dd] *[1-9]+\)"]:
-            p = re.compile (exp)
-            st_album = p.sub ('', st_album)
-
-        st_album_no_vol = st_album
-        for exp in ["\(*[Vv]ol.*[1-9]+\)*"]:
-            p = re.compile (exp)
-            st_album_no_vol = p.sub ('', st_album_no_vol)
-
-        self.st_album_no_vol = st_album_no_vol
-
-        # Save current search's entry properties
-        self.search_album = st_album
-        self.search_artist = st_artist
-        self.search_album_no_vol = st_album_no_vol
-
-        # TODO: Improve to decrease wrong cover downloads, maybe add severity?
-        # Assemble list of search keywords (and thus search queries)
-        if st_album == u'Unknown':
-            self.keywords.append ("%s Best of" % (st_artist))
-            self.keywords.append ("%s Greatest Hits" % (st_artist))
-            self.keywords.append ("%s Essential" % (st_artist))
-            self.keywords.append ("%s Collection" % (st_artist))
-            self.keywords.append ("%s" % (st_artist))
-        elif st_artist == u'Unknown':
-            self.keywords.append ("%s" % (st_album))
-            if st_album_no_vol != st_artist:
-                self.keywords.append ("%s" % (st_album_no_vol))
-            self.keywords.append ("Various %s" % (st_album))
-        else:
-            if st_album != st_artist:
-                self.keywords.append ("%s %s" % (st_artist, st_album))
-                if st_album_no_vol != st_album:
-                    self.keywords.append ("%s %s" %
-                        (st_artist, st_album_no_vol))
-                self.keywords.append ("Various %s" % (st_album))
-            self.keywords.append ("%s" % (st_artist))
-
-        # Initiate asynchronous search
-        self.search_next ()
-
-    def search_next(self):
-        """Search again, because the last one didn't find any covers."""
-        if len (self.keywords) == 0:
-            # No keywords left to search -> no results
-            self.on_search_completed (None)
-            return False
-
-        self.searching = True
-
-        url = "http://ecs.amazonaws." + self.tld + "/onca/xml" \
-              "?Service=AWSECommerceService"                   \
-              "&AWSAccessKeyId=" + LICENSE_KEY +               \
-              "&AssociateTag=" + ASSOCIATE +                   \
-              "&ResponseGroup=Images,ItemAttributes"           \
-              "&Operation=ItemSearch"                          \
-              "&ItemSearch.Shared.SearchIndex=Music"
-
-        job = 1
-        while job <= MAX_BATCH_JOBS and len (self.keywords) > 0:
-            keyword = self.keywords.pop (0)
-            keyword = keyword.encode (self.encoding, "ignore")
-            keyword = keyword.strip ()
-            keyword = urllib.quote (keyword)
-            url += "&ItemSearch.%d.Keywords=%s" % (job, keyword)
-            job += 1
-
-        # Retrieve search for keyword
-        temp = urllib.urlopen(url)
-        search_results = temp.read()
-        self.on_search_response(search_results)
-        return True
-
-    def __unmarshal(self, element):
-        rc = Bag()
-        child_elements = [e for e in element.childNodes if isinstance (e,
-            minidom.Element)]
-        if child_elements:
-            for child in child_elements:
-                key = child.tagName
-                if hasattr (rc, key):
-                    if not isinstance (getattr (rc, key), list):
-                        setattr (rc, key, [getattr (rc, key)])
-                    getattr (rc, key).append (self.__unmarshal (child))
-                # get_best_match_urls() wants a list, even if there is only
-                # one item/artist
-                elif child.tagName in ("Items", "Item", "Artist"):
-                    setattr (rc, key, [self.__unmarshal(child)])
-                else:
-                    setattr (rc, key, self.__unmarshal(child))
-        else:
-            rc = "".join ([e.data for e in element.childNodes if isinstance (e,
-                minidom.Text)])
-        return rc
-
-    def on_search_response (self, result_data):
-        '''Check search results
-
-        If results are not good, we search again with the next keyword.
-        '''
-        if result_data is None:
-            self.search_next()
-            return
-
-        try:
-            xmldoc = minidom.parseString(result_data)
-        except (TypeError, AttributeError):
-            self.search_next()
-            return
-
-        data = self.__unmarshal (xmldoc)
-        if not hasattr (data, "ItemSearchResponse") or \
-           not hasattr (data.ItemSearchResponse, "Items"):
-            # Something went wrong ...
-            self.search_next ()
-        else:
-            # We got some search results
-            self.on_search_results (data.ItemSearchResponse.Items)
-
-    def on_search_results (self, results):
-        '''Results were found, now we need to take action.'''
-        self.on_search_completed (results)
-
-    def on_search_completed (self, result):
-        """
-        Search completed and results found.
-
-        Download large album art image from the first result and save it to
-        the disk. This function diverges greatly from the rhythmbox
-        implementation in order to avoid their loader and CoverArtDatabase
-        """
-        self.searching = False
-        image_urls = self.get_best_match_urls(result)
-        if len(image_urls) == 0:
-            return
-        image_url = image_urls[0]
-        image_file = urllib.urlopen(image_url)
-        # base64 encode artist and album so there can be a '/' in the artist
-        # or album
-        artist_album = self.artist + " - " + self.album
-        artist_album = artist_album.encode("base64")
-
-        dest = open(os.path.join(self.path, artist_album + ".jpg"),'w')
-        dest.write(image_file.read())
-        dest.close()
-
-        if self.callback_function is not None:
-            self.callback_function(self.artist, self.album)
-
-    def get_best_match_urls (self, search_results):
-        """Return tuple of URL's to large and medium cover of the best match"""
-        # Default to "no match", our results must match our criteria
-
-        # This code comes from Rhythmbox so we can't control the use of 'filter'
-        # pylint: disable-msg=W0141
-
-        if not search_results:
-            return []
-
-        best_match = None
-
-        for result in search_results:
-            if not hasattr (result, "Item"):
-                # Search was unsuccessful, try next batch job
-                continue
-
-            items = filter(self.__valid_match, result.Item)
-            if self.search_album != u'Unknown':
-                album_check = self.__tidy_up_string (self.search_album)
-                for item in items:
-                    if not hasattr (item.ItemAttributes, "Title"):
-                        continue
-
-                    album = self.__tidy_up_string (item.ItemAttributes.Title)
-                    if album == album_check:
-                        # Found exact album, can not get better than that
-                        best_match = item
-                        break
-                    # If we already found a best_match, just keep checking for
-                    # exact one. Check the results for both an album name that
-                    # contains the name we're searching for, and an album name
-                    # that's a substring of the name we're searching for
-                    elif (best_match is None) and \
-                         (album.find (album_check) != -1 or
-                          album_check.find (album) != -1):
-                        best_match = item
-
-            # If we still have no definite hit, use first result where artist
-            # matches
-            if (self.search_album == u'Unknown' and \
-                self.search_artist != u'Unknown'):
-                artist_check = self.__tidy_up_string (self.search_artist)
-                if best_match is None:
-                    # Check if artist appears in the Artists list
-                    hit = False
-                    for item in items:
-                        if not hasattr (item.ItemAttributes, "Artist"):
-                            continue
-
-                        for artist in item.ItemAttributes.Artist:
-                            artist = self.__tidy_up_string (artist)
-                            if artist.find (artist_check) != -1:
-                                best_match = item
-                                hit = True
-                                break
-                        if hit:
-                            break
-
-            urls = [getattr (best_match, size).URL for size in ("LargeImage",
-                "MediumImage")
-                    if hasattr (best_match, size)]
-            if urls:
-                return urls
-
-        # No search was successful
-        return []
-
-

=== removed file 'entertainerlib/utils/cd_utils.py'
--- entertainerlib/utils/cd_utils.py	2008-06-16 04:10:47 +0000
+++ entertainerlib/utils/cd_utils.py	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-'''Utilities for handling the cd'''
-# XXX: rockstar - Why do we have  module for a single function?
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
-import os
-
-def eject_cd():
-    os.system("eject")

=== removed file 'entertainerlib/utils/content_management_dialog.py'
--- entertainerlib/utils/content_management_dialog.py	2009-04-17 21:35:32 +0000
+++ entertainerlib/utils/content_management_dialog.py	1970-01-01 00:00:00 +0000
@@ -1,774 +0,0 @@
-#!/usr/bin/env python
-'''Content management GUI for Entertainer'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila and Joshua Scotton"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Joshua Scotton <[e-mail]>")
-
-import os
-import socket
-
-import gtk
-import gtk.glade
-
-from entertainerlib.utils.weather import Weather
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.open_feed_source_dialog import OpenFeedSourceDialog
-
-from entertainerlib.backend.core.message import Message
-from entertainerlib.backend.core.message_bus_proxy import MessageBusProxy
-from entertainerlib.backend.core.message_type_priority import MessageType
-
-class ContentManagementDialog:
-    """
-    This is a content management tool for Entertainer media center application.
-    """
-
-    # Temporary storage for entered URL
-    url = ""
-    GLADE_DIR = os.path.join(os.path.dirname(__file__), "glade")
-
-    def __init__(self, stand_alone):
-        """
-        Initialize content management dialog
-        @param stand_alone: Boolean, Is this dialog running as a stand alone
-            process
-        """
-        self.stand_alone = stand_alone
-        self.config = Configuration()
-        self.weather = Weather()
-
-        # Load glade UI
-        self.gladefile = os.path.join(self.GLADE_DIR,
-            "entertainer-content-management.glade")
-        self.widgets = gtk.glade.XML(self.gladefile)
-
-        # Get content management dialog and bind signal callbacks
-        self.dialog = self.widgets.get_widget("ContentManagementDialog")
-        if (self.dialog):
-            callback_dic = {
-                "on_button_open_list_clicked" :
-                    self.on_button_open_list_clicked,
-                "on_close_button_clicked" : self.on_close_button_clicked,
-                "on_button_remove_videos_clicked" :
-                    self.on_button_remove_videos_clicked,
-                "on_button_add_videos_clicked" :
-                    self.on_button_add_videos_clicked,
-                "on_button_edit_videos_clicked" :
-                    self.on_button_edit_videos_clicked,
-                "on_checkbutton_video_metadata_toggled" :
-                    self.on_checkbutton_video_metadata_toggled,
-                "on_button_add_music_clicked" :
-                    self.on_button_add_music_clicked,
-                "on_button_remove_music_clicked" :
-                    self.on_button_remove_music_clicked,
-                "on_button_edit_music_clicked" :
-                    self.on_button_edit_music_clicked,
-                "on_lyrics_checkbox_toggled" : self.on_lyrics_checkbox_toggled,
-                "on_art_checkbox_toggled" : self.on_art_checkbox_toggled,
-                "on_button_add_images_clicked" :
-                    self.on_button_add_images_clicked,
-                "on_button_remove_images_clicked" :
-                    self.on_button_remove_images_clicked,
-                "on_button_edit_images_clicked" :
-                    self.on_button_edit_images_clicked,
-                "on_button_add_feed_clicked" :
-                    self.on_button_add_feed_clicked,
-                "on_button_remove_feed_clicked" :
-                    self.on_button_remove_feed_clicked,
-                "on_button_edit_feed_clicked" :
-                    self.on_button_edit_feed_clicked,
-                "on_fetch_interval_spinbutton_value_changed" :
-                    self.on_fetch_interval_spinbutton_value_changed,
-                "on_ContentManagementDialog_destroy" : self.on_dialog_closed,
-                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event,
-                "on_url_dialog_ok_button_clicked" :
-                    self.on_url_dialog_ok_button_clicked,
-                "on_url_dialog_cancel_button_clicked" :
-                    self.on_url_dialog_cancel_button_clicked,
-                "on_button_video_rebuild_clicked" :
-                    self.on_button_video_rebuild_clicked,
-                "on_button_music_rebuild_clicked" :
-                    self.on_button_music_rebuild_clicked,
-                "on_button_image_rebuild_clicked" :
-                    self.on_button_image_rebuild_clicked,
-                "on_button_feed_rebuild_clicked" :
-                    self.on_button_feed_rebuild_clicked,
-                "on_button_add_weather_clicked" :
-                    self.on_button_add_weather_clicked,
-                "on_button_remove_weather_clicked" :
-                    self.on_button_remove_weather_clicked,
-                "on_weather_display_checkbox_toggled" :
-                    self.on_weather_display_checkbox_toggled,
-                "on_location_find_button_clicked" :
-                    self.on_location_find_button_clicked,
-                "on_location_cancel_button_clicked" :
-                    self.on_location_cancel_button_clicked,
-                "on_location_add_button_clicked" :
-                    self.on_location_add_button_clicked,
-                "on_location_entry_activate" : self.on_location_entry_activate}
-        self.widgets.signal_autoconnect(callback_dic)
-
-        # Initialize dialog widgets with correct values and show dialog
-        self.init_dialog_values_from_configure_file()
-        self.dialog.resize(500, 300)
-        self.dialog.show()
-
-        # Initialize location list in search dialog
-        result_list = self.widgets.get_widget("location_results_treeview")
-        store = gtk.ListStore(str)
-        result_list.set_model(store)
-        cell_renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn(_("Location"), cell_renderer, text=0)
-        result_list.append_column(column)
-
-# Signal handlers
-
-    def on_dialog_closed(self, widget):
-        """Callback function for dialog's close button"""
-        try:
-            proxy = MessageBusProxy(client_name = "Content Management GUI")
-            proxy.connectToMessageBus()
-            proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
-            proxy.disconnectFromMessageBus()
-        except socket.error:
-            error = gtk.MessageDialog(
-                    None, gtk.DIALOG_MODAL,
-                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
-                        "Entertainer backend is not running. "
-                        "Cache cannot be rebuilt."
-                    ))
-            error.run()
-            error.destroy()
-
-
-        if(self.stand_alone):
-            self.dialog.hide()
-            self.dialog.destroy()
-            gtk.main_quit()
-        else:
-            self.dialog.hide()
-            self.dialog.destroy()
-
-    def on_close_button_clicked(self, widget):
-        """Callback function for dialog's close button"""
-        if(self.stand_alone):
-            self.dialog.hide()
-            self.dialog.destroy()
-            gtk.main_quit()
-        else:
-            self.dialog.hide()
-            self.dialog.destroy()
-
-    def on_button_add_videos_clicked(self, widget):
-        """Opens add URL dialog. """
-        widget = self.widgets.get_widget("treeview_videos")
-        model = widget.get_model()
-        # Open "Select folder" dialog
-        dialog =  gtk.FileChooserDialog(_("Select video folder"), None,
-            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
-            (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,
-                gtk.STOCK_OPEN,gtk.RESPONSE_OK),
-            None)
-        status = dialog.run()
-        # If folder was selected we add it to model and update config file
-        if(status == gtk.RESPONSE_OK):
-            self.add_to_model_and_config(dialog.get_current_folder(), model,
-                self.video_folders, "Videos")
-        dialog.destroy()
-
-    def on_button_remove_videos_clicked(self, widget):
-        """Remove currently selected folder from video folders"""
-        widget = self.widgets.get_widget("treeview_videos")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        rm_folder = model.get_value(selection[1], 0)
-        self.video_folders.remove(rm_folder)
-        str_folders = ";".join(self.video_folders)
-        self.config.write_content_value("Videos", "folders", str_folders)
-        model.remove(selection[1])
-
-    def on_button_edit_videos_clicked(self, widget):
-        """Edit currently selected folder"""
-        widget = self.widgets.get_widget("treeview_videos")
-        url_dialog = self.widgets.get_widget("url_dialog")
-        url_entry = self.widgets.get_widget("url_entry")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        folder = model.get_value(selection[1], 0)
-        url_entry.set_text(folder)
-        url_dialog.set_title(_("Edit URL"))
-        status = url_dialog.run()
-        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
-            # Update list model
-            model.set_value(selection[1], 0, self.url)
-            # Update configure file
-            pos = self.video_folders.index(folder)
-            self.video_folders.remove(folder)
-            self.video_folders.insert(pos, self.url)
-            str_folders = ";".join(self.video_folders)
-            self.config.write_content_value("Videos", "folders",
-                str_folders)
-
-    def on_checkbutton_video_metadata_toggled(self, widget):
-        """
-        Download video file metadata from internet
-        @param widget: GTK-Widget
-        """
-        self.config.write_content_value("Videos", "download_metadata",
-            widget.get_active())
-
-    def on_button_add_music_clicked(self, widget):
-        """
-        Opens add URL dialog
-        @param widget: GTK-Widget
-        """
-        widget = self.widgets.get_widget("treeview_music")
-        model = widget.get_model()
-        # Open "Select folder" dialog
-        dialog =  gtk.FileChooserDialog(_("Select music folder"), None,
-            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
-            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
-                gtk.RESPONSE_OK),
-            None)
-        status = dialog.run()
-        # If folder was selected we add it to model and update config file
-        if(status == gtk.RESPONSE_OK):
-            self.add_to_model_and_config(dialog.get_current_folder(), model,
-                self.music_folders, "Music")
-        dialog.destroy()
-
-    def on_button_remove_music_clicked(self, widget):
-        """Remove currently selected folder from music folders"""
-        widget = self.widgets.get_widget("treeview_music")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        rm_folder = model.get_value(selection[1], 0)
-        self.music_folders.remove(rm_folder)
-        str_folders = ";".join(self.music_folders)
-        self.config.write_content_value("Music", "folders", str_folders)
-        model.remove(selection[1])
-
-    def on_button_edit_music_clicked(self, widget):
-        """Edit currently selected music folder"""
-        widget = self.widgets.get_widget("treeview_music")
-        url_dialog = self.widgets.get_widget("url_dialog")
-        url_entry = self.widgets.get_widget("url_entry")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        folder = model.get_value(selection[1], 0)
-        url_entry.set_text(folder)
-        url_dialog.set_title(_("Edit URL"))
-        status = url_dialog.run()
-        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
-            # Update list model
-            model.set_value(selection[1], 0, self.url)
-            # Update configure file
-            pos = self.music_folders.index(folder)
-            self.music_folders.remove(folder)
-            self.music_folders.insert(pos, self.url)
-            str_folders = ";".join(self.music_folders)
-            self.config.write_content_value("Music", "folders", str_folders)
-
-    def on_button_add_images_clicked(self, widget):
-        """Opens add URL dialog. """
-        widget = self.widgets.get_widget("treeview_images")
-        model = widget.get_model()
-        # Open "Select folder" dialog
-        dialog =  gtk.FileChooserDialog(_("Select image folder"), None,
-            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
-            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
-                gtk.RESPONSE_OK),
-            None)
-        status = dialog.run()
-        # If folder was selected we add it to model and update config file
-        if(status == gtk.RESPONSE_OK):
-            self.add_to_model_and_config(dialog.get_current_folder(), model,
-                self.image_folders, "Images")
-        dialog.destroy()
-
-    def on_button_remove_images_clicked(self, widget):
-        """Remove currently selected folder from images folders"""
-        widget = self.widgets.get_widget("treeview_images")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        rm_folder = model.get_value(selection[1], 0)
-        self.image_folders.remove(rm_folder)
-        str_folders = ";".join(self.image_folders)
-        self.config.write_content_value("Images", "folders", str_folders)
-        model.remove(selection[1])
-
-    def on_button_edit_images_clicked(self, widget):
-        """Edit currently selected music folder"""
-        widget = self.widgets.get_widget("treeview_images")
-        url_dialog = self.widgets.get_widget("url_dialog")
-        url_entry = self.widgets.get_widget("url_entry")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        folder = model.get_value(selection[1], 0)
-        url_entry.set_text(folder)
-        url_dialog.set_title(_("Edit URL"))
-        status = url_dialog.run()
-        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
-            # Update list model
-            model.set_value(selection[1], 0, self.url)
-            # Update configure file
-            pos = self.image_folders.index(folder)