More unicode work

diff --git a/src/FileStorage.py b/src/FileStorage.py
index 50771ed..ec5644e 100644 (file)
--- a/src/FileStorage.py
+++ b/src/FileStorage.py
@@ -58,7 +58,6 @@ class FileStorage(object):
        def select_book(self, bookName):
                """ Sets the book as the currently playing, and adds it to the
                database if it is not already there"""
-               book_file = os.path.join(self.books_path, bookName)
                if bookName not in self._books:
                        self._books[bookName] = {
                                "chapter": 0,

diff --git a/src/Gui.py b/src/Gui.py
index 5b0ff29..c2a3fb8 100644 (file)
--- a/src/Gui.py
+++ b/src/Gui.py
@@ -2,6 +2,7 @@ from __future__ import with_statement
 
 import os
 import ConfigParser
+import codecs
 import logging
 
 import gobject
@@ -390,7 +391,6 @@ class Gui(object):
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def update_seek(self):
-               #print self.controller.get_percentage()
                if self.controller.is_playing():
                        gtk.gdk.threads_enter()
                        self.seek.set_value(self.controller.get_percentage() * 100)
@@ -412,7 +412,6 @@ class Gui(object):
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def seek_changed(self, seek, scroll , value):
-               # print "sok", scroll
                self.controller.seek_percent(seek.get_value() / 100.0)
 
        @gtk_toolbox.log_exception(_moduleLogger)
@@ -453,10 +452,10 @@ class Gui(object):
                ):
                        self.quit()
                elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
-                       with open(constants._user_logpath_, "r") as f:
+                       with codecs.open(constants._user_logpath_, "r", "utf-8") as f:
                                logLines = f.xreadlines()
-                               log = "".join(logLines)
-                               self._clipboard.set_text(str(log))
+                               log = u"".join(logLines)
+                               self._clipboard.set_text(log)
                        return True
                elif event.keyval in RETURN_TYPES:
                        if self.controller.is_playing():

diff --git a/src/Player.py b/src/Player.py
index 6293ce5..4d8aa3f 100644 (file)
--- a/src/Player.py
+++ b/src/Player.py
@@ -74,10 +74,11 @@ class Player(object):
 
        @staticmethod
        def __format_name(path):
+               name = os.path.basename(path).decode("utf-8")
                if os.path.isfile(path):
-                       return os.path.basename(path).rsplit(".", 1)[0]
-               else:
-                       return os.path.basename(path)
+                       # remove the extension
+                       name.rsplit(".", 1)[0]
+               return name
 
        def set_book(self, bookPath):
                oldBookName = self.storage.get_selected()
@@ -140,9 +141,8 @@ class Player(object):
                        if 0 < target_time:
                                time.sleep(1)
                                self.player.seek_time(target_time)
-                       #print self.player.elapsed()
                else:
-                       print "No book selected, find one in ", self._bookDir
+                       _moduleLogger.info("No book selected, find one in ", self._bookDir)
 
        def stop(self):
                position = self.player.elapsed()
@@ -155,16 +155,12 @@ class Player(object):
                return self.player.playing
 
        def sleeptimer(self, secs):
-               #print "sleeper", secs
                time.sleep(secs)
-               #print "now its time to sleep"
                self.stop()
 
        def start_sleeptimer(self, secs):
-               #print "startin sleep"
                sleep_thread = threading.Thread(target=self.sleeptimer, args=(secs, ))
                sleep_thread.start()
-               #print "started sleep"
 
        def get_percentage(self):
                try: