Additional work to match things to my build structure

diff --git a/Makefile b/Makefile
index 103df9b..f45d839 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ TODO_FILE=./TODO
 DEBUGGER=winpdb
 UNIT_TEST=nosetests --with-doctest -w .
 SYNTAX_TEST=support/test_syntax.py
+STYLE_TEST=../../Python/tools/pep8.py --ignore=W191,E501
 LINT_RC=./support/pylint.rc
 LINT=pylint --rcfile=$(LINT_RC)
 PROFILE_GEN=python -m cProfile -o .profile
@@ -43,6 +44,7 @@ package: $(OBJ)
        $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
        cp support/icons/hicolor/26x26/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
+       cp support/icons/hicolor/48x48/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/48x48-$(PROJECT_NAME).png
        cp support/icons/hicolor/64x64/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/64x64-$(PROJECT_NAME).png
        cp support/icons/hicolor/scalable/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
        cp support/builddeb.py $(BUILD_PATH)/generic

diff --git a/src/nqaap.py b/src/nqaap.py
index ab32ba2..296d7d8 100755 (executable)
--- a/src/nqaap.py
+++ b/src/nqaap.py
@@ -1,28 +1,30 @@
 #!/usr/bin/env python
 
 import os
+import sys
 import logging
 
-import constants
-import nqaap_gtk
-
 
 _moduleLogger = logging.getLogger(__name__)
+sys.path.append("/opt/dialcentral/lib")
+
+
+import constants
+import nqaap_gtk
 
 
-try:
-       os.makedirs(constants._data_path_)
-except OSError, e:
-       if e.errno != 17:
-               raise
+if __name__ == "__main__":
+       try:
+               os.makedirs(constants._data_path_)
+       except OSError, e:
+               if e.errno != 17:
+                       raise
 
-logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_)
-_moduleLogger.info("%s %s-%s" % (constants.__pretty_app_name__, constants.__version__, constants.__build__))
-_moduleLogger.info("OS: %s" % (os.uname()[0], ))
-_moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:])
-_moduleLogger.info("Hostname: %s" % os.uname()[1])
+       logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
+       logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_, format=logFormat)
+       _moduleLogger.info("%s %s-%s" % (constants.__pretty_app_name__, constants.__version__, constants.__build__))
+       _moduleLogger.info("OS: %s" % (os.uname()[0], ))
+       _moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:])
+       _moduleLogger.info("Hostname: %s" % os.uname()[1])
 
-try:
        nqaap_gtk.run()
-finally:
-       logging.shutdown()

diff --git a/support/builddeb.py b/support/builddeb.py
index 42c1066..aec1354 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -92,9 +92,9 @@ def build_package(distribution):
        p.changelog = __changelog__\r
        p.postinstall = __postinstall__\r
        p.icon = {\r
-               "debian": "src/usr/share/icons/hicolor/26x26/hildon/nqaap.png",\r
-               "diablo": "src/usr/share/icons/hicolor/26x26/hildon/nqaap.png",\r
-               "fremantle": "src/usr/share/icons/hicolor/48x48/hildon/nqaap.png",\r
+               "debian": "26x26-%s.png" % constants.__app_name__,\r
+               "diablo": "26x26-%s.png" % constants.__app_name__,\r
+               "fremantle": "48x48-%s.png" % constants.__app_name__,\r
        }[distribution]\r
        p["/opt/%s/bin" % constants.__app_name__] = [ "%s.py" % constants.__app_name__ ]\r
        for relPath, files in unflatten_files(find_files("src", ".")).iteritems():\r
@@ -106,10 +106,10 @@ def build_package(distribution):
                        for (oldName, newName) in files\r
                )\r
        p["/usr/share/applications/hildon"] = ["%s.desktop" % constants.__app_name__]\r
-       p["/usr/share/icons/hicolor/26x26/hildon"] = ["%s.png" % constants.__app_name__]\r
-       p["/usr/share/icons/hicolor/48x48/hildon"] = ["%s.png" % constants.__app_name__]\r
-       p["/usr/share/icons/hicolor/64x64/hildon"] = ["%s.png" % constants.__app_name__]\r
-       p["/usr/share/icons/hicolor/scalable/hildon"] = ["%s.png" % constants.__app_name__]\r
+       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-%s.png" % constants.__app_name__]\r
+       p["/usr/share/icons/hicolor/48x48/hildon"] = ["48x48-%s.png" % constants.__app_name__]\r
+       p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-%s.png" % constants.__app_name__]\r
+       p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-%s.png" % constants.__app_name__]\r
 \r
        print p\r
        if distribution == "debian":\r

diff --git a/support/nqaap.desktop b/support/nqaap.desktop
index db906b7..a1b6a06 100644 (file)
--- a/support/nqaap.desktop
+++ b/support/nqaap.desktop
@@ -2,7 +2,7 @@
 Version=1.0.0
 Encoding=UTF-8
 Name=nQaap
-Exec=/usr/bin/run-standalone.sh python /opt/Nqa-Audiobook-player/nqaap.py
+Exec=/usr/bin/run-standalone.sh python /opt/nqaap/bin/nqaap.py
 Icon=nqaap
 X-Icon-path=/usr/share/icons
 X-Window-Icon=nqaap

diff --git a/support/py2deb.py b/support/py2deb.py
index a6d7833..0518480 100644 (file)
--- a/support/py2deb.py
+++ b/support/py2deb.py
@@ -473,6 +473,9 @@ class Py2deb(object):
 
         self.__files[path]=nfiles
 
+    def __getitem__(self, k):
+        return self.__files[k]
+
     def __delitem__(self, k):
         del self.__files[k]
 
@@ -786,13 +789,7 @@ FILES :
 
             generalParagraph = "\n".join(generalParagraphFields)
             specificParagraph = "\n".join(specificParagraphFields)
-            controlTemplate = "\n\n".join((generalParagraph, specificParagraph))
-            print "_"*90
-            print packageContents.keys()
-            print "_"*90
-            print repr(controlTemplate)
-            print "_"*90
-            controlContent = controlTemplate % packageContents
+            controlContent = "\n\n".join((generalParagraph, specificParagraph)) % packageContents
             open(os.path.join(DEBIAN, "control"), "w").write(controlContent)
 
             #==========================================================================

diff --git a/support/pylint.rc b/support/pylint.rc
index 6240de9..2a371a1 100644 (file)
--- a/support/pylint.rc
+++ b/support/pylint.rc
@@ -302,4 +302,4 @@ max-module-lines=1000
 
 # String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
 # tab).
-indent-string='    '
+indent-string='\t'