Merge lp:~michael.nelson/ubuntu-webcatalog/import-icon-file into lp:ubuntu-webcatalog

[Michael Nelson]

Overview
========

This branch attempts to extract the icons included in the app-install-data package and add them to the application models as they are imported.

But, after running a full import (http://people.canonical.com/~michaeln/tmp/import.txt), the database shows that:
{{{
>>> Application.objects.count()
2381

>>> Application.objects.filter(icon='').count()
573
}}}

That's based on the desktop and icon files in:

http://archive.ubuntu.com/ubuntu/pool/main/a/app-install-data-ubuntu/app-install-data_0.11.04.7.1_all.deb

I checked with mvo, and apparently this is valid:

{{{
13:45 <mvo> it sounds a bit high, but I need to double check, hold on a couple of minutes, should be straightforward
13:55 <mvo> I have (on natty) 2226 apps and 584 missing icons
}}}

Issues
======
I started trying to add better test coverage of the commands add_icon_to_app method, but got stuck when tests froze with this diff:

https://pastebin.canonical.com/46055/

(actually, not only did the test freeze, but the VM I was working on needed to be restarted each time :/ )

As this is just a prototype, i'd be happy to land it with the current tests, but would prefer to find a way for the above patch to work.

Running the command to import apps with icons
=============================================
It'll take quite a while, but if you want to see the command running, use:
fab manage:'import_app_install_data -v 1'

[Anthony Lenton (elachuni)]

Hi Michael,

Great code as usual :)

- The two new tests fail for me, apparently due to arbitrary ordering in the DB when you get all() applications. Not assuming that firefox will be the first app retrieved and scribus the second one fixes it here.

- As for the pastebinned test, it seems to burn cpu calling the mocked os.path.exists, as django.core.files.storage also calls out to os.path.exists to get an available filename within the call to app.save(), and then iterates until it finds a filename that *doesn't* exist. It's fixed here by patching 'webcatalog.management.commands.import_app_install_data.os' in the test instead, and then setting mock_os.path.exists.return_value = True so that storage can still use the real version. The test then fails for a different reason, but it might be what you were looking for?

Anyway, I'll probably land this with the two small test fixes, just to see the pretty icons :P

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-04-12 13:16:43 +0000
+++ .bzrignore	2011-04-13 15:01:18 +0000
@@ -3,3 +3,4 @@
 virtualenv/
 django_project/local_settings.py
 django_project/static/
+django_project/media_root_dev/*

=== added directory 'django_project/media_root_dev'
=== modified file 'django_project/settings.py'
--- django_project/settings.py	2011-04-08 12:25:25 +0000
+++ django_project/settings.py	2011-04-13 15:01:18 +0000
@@ -45,7 +45,7 @@
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = './django_project/media_root_dev/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.

=== modified file 'requirements.txt'
--- requirements.txt	2011-04-11 13:51:17 +0000
+++ requirements.txt	2011-04-13 15:01:18 +0000
@@ -3,3 +3,4 @@
 setuptools
 south
 python-debian
+PIL

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2011-04-12 15:05:33 +0000
+++ src/webcatalog/forms.py	2011-04-13 15:01:18 +0000
@@ -45,6 +45,7 @@
     'x-appinstall-description': 'description',
     'x-appinstall-section': 'section',
     'type': 'app_type',
+    'icon': 'icon_name',
     }
 
 

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2011-04-13 01:46:00 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2011-04-13 15:01:18 +0000
@@ -22,11 +22,16 @@
     with_statement,
     )
 
+import os
+import shutil
 import tempfile
 import urllib
 from apt_inst import DebFile
+from glob import iglob
 from optparse import make_option
+from StringIO import StringIO
 
+from django.core.files.images import ImageFile
 from django.core.management.base import BaseCommand
 
 from webcatalog.forms import ApplicationForm
@@ -72,26 +77,68 @@
         if self.verbosity > 0:
             self.stdout.write(
                 "Processing application data to update database...\n")
+        data_dir = tempfile.mkdtemp()
+        deb_file.data.extractall(data_dir)
+        matcher = data_dir + '/usr/share/app-install/desktop/*.desktop'
+        icon_dir = data_dir + '/usr/share/app-install/icons/'
+        for desktop_file in iglob(matcher):
+            self.process_desktop_file(desktop_file, icon_dir)
 
-        deb_file.data.go(self.process_archive_member)
+        shutil.rmtree(data_dir)
 
     def get_uri_for_series(self, distro_series):
         # Write a temporary sources.list, update the cache and access:
         # cache['app-install-data-ubuntu'].candidate.uri
         pass
 
-    def process_archive_member(self, member, data):
-        if member.name.endswith('desktop'):
-            form = ApplicationForm.get_form_from_desktop_data(data)
-
-            if form.is_valid():
-                app = form.save()
-                app.update_departments()
-                if self.verbosity > 0:
-                    self.stdout.write(
-                        u"{0} created.\n".format(app.name).encode('utf-8'))
-            else:
-                if self.verbosity > 0:
-                    self.stdout.write(
-                        u"Skipping {0} as input failed validation: {1}.\n".format(
-                            member.name, form.errors).encode('utf-8'))
+    def process_desktop_file(self, desktop_file_path, icon_dir):
+        with open(desktop_file_path, 'r') as desktop_file:
+            data = desktop_file.read()
+        form = ApplicationForm.get_form_from_desktop_data(data)
+
+        if form.is_valid():
+            app = form.save()
+            app.update_departments()
+            self.add_icon_to_app(app, icon_dir)
+            if self.verbosity > 0:
+                self.stdout.write(
+                    u"{0} created.\n".format(app.name).encode('utf-8'))
+        else:
+            if self.verbosity > 0:
+                self.stdout.write(
+                    u"Skipping {0} as input failed validation: {1}.\n".format(
+                        member.name, form.errors).encode('utf-8'))
+
+    def add_icon_to_app(self, app, icon_dir):
+        # If the desktop file specifies an icon, we check for it in the
+        # default location, otherwise we use the packagename and check
+        # for that.
+        icon_name = app.icon_name or app.package_name
+        icon_path_generic = icon_dir + "{0}".format(icon_name)
+        icon_path = ''
+
+        # Some desktop files specify the icon extension as part of the
+        # icon name.
+        supported_extensions = ('xpm', 'png', 'svg', 'tiff')
+        if icon_path_generic.endswith(supported_extensions):
+            if os.path.exists(icon_path_generic):
+                icon_path = icon_path_generic
+        else:
+            # Python's glob module doesn't seem to support extra matchers
+            # such as '@(xpm|png|svg)'.
+            for ext in supported_extensions:
+                path_with_ext = icon_path_generic + '.' + ext
+                if os.path.exists(path_with_ext):
+                    icon_path = path_with_ext
+                    break
+
+        if icon_path:
+            with open(icon_path, "r") as icon_file:
+                app.icon = ImageFile(icon_file)
+                app.save()
+        else:
+            if self.verbosity > 0:
+                self.stdout.write(
+                    u"No icon found for {0} at {1}.({2}).\n".format(
+                        app.name, icon_path_generic,
+                        '|'.join(supported_extensions)).encode('utf-8'))

=== modified file 'src/webcatalog/models.py'
--- src/webcatalog/models.py	2011-04-13 01:46:00 +0000
+++ src/webcatalog/models.py	2011-04-13 15:01:18 +0000
@@ -56,9 +56,11 @@
     section = models.CharField(max_length=32)
     categories = models.CharField(max_length=255, blank=True)
     departments = models.ManyToManyField('Department', blank=True)
+    icon_name = models.CharField(max_length=255, blank=True)
+    icon = models.ImageField(upload_to='icons/%Y/%m', max_length=200,
+        null=True, blank=True)
 
     # Other desktop fields used by s-c
-    gnome_full_name = models.CharField(max_length=255, blank=True)
     # x-gnome-fullname
     # X-AppInstall-Ignore
     # Icon

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2011-04-12 13:58:04 +0000
+++ src/webcatalog/tests/factory.py	2011-04-13 15:01:18 +0000
@@ -24,6 +24,7 @@
 import os
 from itertools import count
 
+from django.core.files.images import ImageFile
 from django.test import TestCase
 
 from webcatalog.models import Application
@@ -70,7 +71,7 @@
         user.save()
 
     def make_application(self, package_name=None, name=None,
-        comment=None, description=None):
+        comment=None, description=None, icon_name='', icon=None):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -82,7 +83,8 @@
 
         return Application.objects.create(
             package_name=package_name, name=name, comment=comment,
-            description=description, popcon=999)
+            description=description, popcon=999, icon=icon,
+            icon_name=icon_name)
 
     def get_test_path(self, file_name):
         return os.path.join(

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2011-04-11 14:08:41 +0000
+++ src/webcatalog/tests/test_commands.py	2011-04-13 15:01:18 +0000
@@ -21,6 +21,7 @@
     absolute_import,
     with_statement,
     )
+import os
 import shutil
 import tempfile
 
@@ -80,3 +81,19 @@
         self.assertEqual(
             'Graphic Page Layout and Publication (Stable)',
             scribus.comment)
+
+    def test_icon_added_to_model(self):
+        call_command(
+            'import_app_install_data',
+            local_app_install_deb=self.factory.get_test_path(
+                'app-install-data-test_all.deb'),
+            verbosity=0)
+
+        self.assertEqual(2, Application.objects.count())
+        scribus, firefox = Application.objects.all()
+        self.assertEqual(
+            os.path.getsize(self.factory.get_test_path('firefox.xpm')),
+            firefox.icon.size)
+        self.assertEqual(
+            os.path.getsize(self.factory.get_test_path('scribus.xpm')),
+            scribus.icon.size)

=== added file 'src/webcatalog/tests/test_data/firefox.xpm'
--- src/webcatalog/tests/test_data/firefox.xpm	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/firefox.xpm	2011-04-13 15:01:18 +0000
@@ -0,0 +1,294 @@
+/* XPM */
+static char *firefox[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 256 2 ",
+"   c #1F0A03",
+".  c #330F09",
+"X  c #000836",
+"o  c #211220",
+"O  c #282036",
+"+  c #420E03",
+"@  c #541705",
+"#  c #701805",
+"$  c #6D3812",
+"%  c #4E2B3B",
+"&  c #6C302F",
+"*  c #001147",
+"=  c #011C5A",
+"-  c #132C5C",
+";  c #282C59",
+":  c #253255",
+">  c #001E67",
+",  c #062767",
+"<  c #0C306F",
+"1  c #032B76",
+"2  c #0D3677",
+"3  c #133C76",
+"4  c #123D7D",
+"5  c #213970",
+"6  c #523746",
+"7  c #354A5E",
+"8  c #1D4C7D",
+"9  c #3A547A",
+"0  c #374F68",
+"q  c #4B4848",
+"w  c #565867",
+"e  c #5F6A68",
+"r  c #6C7175",
+"t  c #880B03",
+"y  c #940E03",
+"u  c #990E03",
+"i  c #951204",
+"p  c #9B1204",
+"a  c #9B1D06",
+"s  c #A31504",
+"d  c #A31D05",
+"f  c #AA1905",
+"g  c #B71F05",
+"h  c #842D11",
+"j  c #AB2A08",
+"k  c #AB2406",
+"l  c #B42A05",
+"z  c #B62708",
+"x  c #AE330D",
+"c  c #BB3B0D",
+"v  c #B8350B",
+"b  c #C23C0B",
+"n  c #C53806",
+"m  c #CF3507",
+"M  c #9F4D10",
+"N  c #B9490D",
+"B  c #BD5F0E",
+"V  c #A3481D",
+"C  c #B45715",
+"Z  c #B05118",
+"A  c #BF7E1D",
+"S  c #B96610",
+"D  c #8E5139",
+"F  c #A9572A",
+"G  c #B95B29",
+"H  c #AD4C23",
+"J  c #946D2F",
+"K  c #B8652C",
+"L  c #AF7A3F",
+"P  c #BE6E33",
+"I  c #C3420D",
+"U  c #CD450C",
+"Y  c #CD4B0E",
+"T  c #C9460A",
+"R  c #D34B06",
+"E  c #D1460B",
+"W  c #D44A0C",
+"Q  c #D84906",
+"!  c #D3520D",
+"~  c #DA540C",
+"^  c #D55B0E",
+"/  c #DC5D0B",
+"(  c #D85907",
+")  c #CB4C11",
+"_  c #C34B13",
+"`  c #CE5412",
+"'  c #CA5618",
+"]  c #D25512",
+"[  c #D35C14",
+"{  c #DC5C11",
+"}  c #E15709",
+"|  c #E25210",
+" . c #D5660C",
+".. c #DB630D",
+"X. c #DE6C0B",
+"o. c #D86807",
+"O. c #DF7206",
+"+. c #CA6212",
+"@. c #D66315",
+"#. c #DA6413",
+"$. c #DC6A16",
+"%. c #DB6C1A",
+"&. c #D8641C",
+"*. c #DF701A",
+"=. c #E16B0C",
+"-. c #E2740C",
+";. c #E27E0A",
+":. c #E87B0C",
+">. c #E56914",
+",. c #E57917",
+"<. c #C46A27",
+"1. c #CE7031",
+"2. c #EA7727",
+"3. c #895941",
+"4. c #AA5846",
+"5. c #8B6A56",
+"6. c #947659",
+"7. c #AE6D45",
+"8. c #9A7F69",
+"9. c #CC7F4D",
+"0. c #B68B30",
+"q. c #DF9013",
+"w. c #E6850A",
+"e. c #E78B0D",
+"r. c #ED950E",
+"t. c #E48312",
+"y. c #EC8417",
+"u. c #F0801D",
+"i. c #EB9613",
+"p. c #EC9919",
+"a. c #F09F19",
+"s. c #DFA01E",
+"d. c #EFA016",
+"f. c #F2A718",
+"g. c #F8B81E",
+"h. c #D38A22",
+"j. c #DC8531",
+"k. c #E98C38",
+"l. c #F89337",
+"z. c #DBA529",
+"x. c #EDA624",
+"c. c #F4B724",
+"v. c #EAB937",
+"b. c #F3BA3A",
+"n. c #F9C42B",
+"m. c #F7C539",
+"M. c #FAD43E",
+"N. c #AE8556",
+"B. c #939373",
+"V. c #A99979",
+"C. c #AE9473",
+"Z. c #A5A27C",
+"A. c #D5934F",
+"S. c #E58C48",
+"D. c #DCAC4F",
+"F. c #E0B147",
+"G. c #E3AE41",
+"H. c #ECA76E",
+"J. c #E6C64C",
+"K. c #F5CA47",
+"L. c #F8D749",
+"P. c #F3C953",
+"I. c #F9D958",
+"U. c #E4C65A",
+"Y. c #FDE056",
+"T. c #DAC964",
+"R. c #EDD765",
+"E. c #F6E66F",
+"W. c #063988",
+"Q. c #144585",
+"!. c #164A8B",
+"~. c #1C4C8C",
+"^. c #1A5596",
+"/. c #1B589B",
+"(. c #265893",
+"). c #305988",
+"_. c #2D608F",
+"`. c #356D9A",
+"'. c #3A749A",
+"]. c #3A638B",
+"[. c #2C5CAB",
+"{. c #1D64A9",
+"}. c #1967B2",
+"|. c #1E72BB",
+" X c #2364A4",
+".X c #2268AB",
+"XX c #2978BB",
+"oX c #3178B9",
+"OX c #3670A6",
+"+X c #496686",
+"@X c #46789D",
+"#X c #507290",
+"$X c #5C798D",
+"%X c #4665A1",
+"&X c #6276A3",
+"*X c #267DC2",
+"=X c #758887",
+"-X c #7A8E99",
+";X c #538DB4",
+":X c #6692AD",
+">X c #2A82C6",
+",X c #2A85CB",
+"<X c #3386C6",
+"1X c #358ACA",
+"2X c #3494D5",
+"3X c #3D9AD7",
+"4X c #4893C8",
+"5X c #498BCC",
+"6X c #56A1C7",
+"7X c #45A1D9",
+"8X c #55AAD8",
+"9X c #74B5D7",
+"0X c #45A9E4",
+"qX c #51AFE2",
+"wX c #55B7E8",
+"eX c #7DC2D6",
+"rX c #58C5F0",
+"tX c #63C3E8",
+"yX c #75CCEB",
+"uX c #7CD6EE",
+"iX c #68D2F1",
+"pX c #75D9F3",
+"aX c #63CEF1",
+"sX c #959D81",
+"dX c #B29880",
+"fX c #B3B59B",
+"gX c #A8B29F",
+"hX c #92A6A6",
+"jX c #A7B7AB",
+"kX c #C49F83",
+"lX c #D4A280",
+"zX c #D8D48A",
+"xX c #85C7DD",
+"cX c #8DD0DE",
+"vX c #91D3DC",
+"bX c #88DBF0",
+"nX c #95DEEE",
+"mX c #A6DDED",
+"MX c #87E4F5",
+"NX c #95ECFB",
+"BX c #99E7F8",
+"VX c #A8EDFA",
+"CX c #B6EAF5",
+"ZX c #A9F1FD",
+"AX c #B7F1FB",
+"SX c #BDF1FB",
+"DX c #ACE1ED",
+"FX c #C3DCD9",
+"GX c #C4F4FC",
+"HX c #CBF5FC",
+"JX c #CBF9FF",
+"KX c #D7FAFF",
+"LX c #DBFBFF",
+"PX c #D1F7FD",
+"IX c #C2EAF4",
+"UX c None",
+/* pixels */
+"UXUXUXUXUXUXUXUXUXUXUXUXUX8 _.`.@X@X'.UXUXUXUXUXUXUXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUXUXUXUX3 '.6XxXmXCXCXIXDXxX;X8 UXUXUXUXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUXUX, ~.5XbXAXJXLXLXLXLXKXHXBX:X$XUXUXUXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUX, !.5XyXBXSXHXHXPXPXHXHXGXZXeXhXgXr UXUXUXUXUXUXUX",
+"UXUXUXl.k.UX= 3 [.5X9XjXkXFXGXHXHXGXSXAXVXuX4X-XzXB.4.UXUXUXUXUX",
+"UXUXUX2.>.6 < w %X&X4.' dXCXSXSXGXSXCXBXbXtX8X:XsXR.V.F UXUXUXUX",
+"UXUXUX| | @.<.9.9.G n 7.cXVXAXAXAXAXBXyXtX8X4X:XfXT.R.N.P UXUXUX",
+"UXUXUX~ >.>.{ / { Y ] B.pXNXNXZXVXBXMXuXtX8XwXoXsXE.I.J.N.F.UXUX",
+"UXUX>.>.| ~ ~ ] ] ] [ H dXgXjXvXNXNXMXMXpXiXrX3X].T.E.K.D.J.UXUX",
+"UXUX,./ ~ Q Y W ] ] #.n W | [ -XpXpXpXiXaXrX7X<X{.B.I.P.P.L.UXUX",
+"UXUX>.} Q E E E ) ] { 1.H.H.C.;XtXrXrXqX0X0XXX.X{.e K.L.I.M.UXUX",
+"UXu.} Q E E E Y W [ &.S.lX-X%X7XwXwXqX1XXX1X>X^.(.w v.J.Y.m.h.UX",
+"UXu.{ E E E Y Y ] &.2.k.r *X3X0X0X3X<XoX X X^.!.+XV.D.b.I.b.+.UX",
+"UX2.| W E E ] ' ' &.<.A.=X,X2X2X2X,X X^.^.!.!.Q.9 R.K.b.L.v.F UX",
+"UX,.~ E ) ] ] c a a 6 ).].*X*X*X>X>X.X^.!.Q.8 8 0 J.M.n.M.z.D UX",
+"UX| W E W ] ` d d j w }.}.|.|.*X|.|.|.{.Q.W.2 2 7 J.J.n.n.0.0.UX",
+"UX| b U Y [ _ l l n P +X{.}.}.OX#X@X.X/.2 2 2 < q J.m.c.c.s.s.UX",
+"UXm m m Y ` ` n T R $.1.5.e 5.P j.D.V.(.8 < 1 : 0.c.n.g.f.i.w.UX",
+"UXm n v Y ] [ W Q } T ' >.*.*.$.#.K 6.(.2 , = 7 z.x.g.d.i.;.UXUX",
+"UXUXz z c ) [ [ ( } ` j c _ I N & 5 W.W.< = * J d.f.f.e.w.o.UXUX",
+"UXUXz f z c ` [ ..>...) h & % ; 2 W.1 1 > > : h.d.r.r.w.o.G UXUX",
+"UXUXg s p k _ ` [ @.$.*.F 6 ; 1 > * X X O q F x.i.w.w.-.V F UXUX",
+"UXUXUXf u u x ) ` [ @.%.*.%.K 6 O o o $ B O.e.p.w.w.=.C 3.A.UXUX",
+"UXUXUXUXs y i v _ ' [ @.@.$. .#.+.+.$.-.=.-.:.-.t.t.o.0.x.UXUXUX",
+"UXUXUXUXf u t i v I ) ` [ @.@.#..... .^  .X.X.t.p.w.r.f.UXUXUXUX",
+"UXUXUXUXUXu y t i l I Y ` ` [ ^ ^ ^ ! ! ^ $.O.t.t.w.t.UXUXUXUXUX",
+"UXUXUXUXUXUXt i i y k v Y ! [ / ....=.=.=.=.*. . .B UXUXUXUXUXUX",
+"UXUXUXUXUXUXUX@ i s p s j b T ! ~ ( / ( .. .C V V UXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUXUX. # s f k l n n T R R ( o.o.C M UXUXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUXUXUXUX+ h x x v T n N N N M $ . UXUXUXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUXUXUXUXUXUXUX+ . @ # .   UXUXUXUXUXUXUXUXUXUXUXUXUX",
+"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX"
+};

=== added file 'src/webcatalog/tests/test_data/scribus.xpm'
--- src/webcatalog/tests/test_data/scribus.xpm	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/scribus.xpm	2011-04-13 15:01:18 +0000
@@ -0,0 +1,598 @@
+/* XPM */
+static char * scribus_cvs_xpm[] = {
+"32 32 563 2",
+"  	c None",
+". 	c #3A89BB",
+"+ 	c #5297C4",
+"@ 	c #6CA7CD",
+"# 	c #76ADD1",
+"$ 	c #78AFD1",
+"% 	c #6DA7CE",
+"& 	c #5398C4",
+"* 	c #3989BB",
+"= 	c #3685B9",
+"- 	c #569AC5",
+"; 	c #88B8D7",
+"> 	c #B2D1E5",
+", 	c #C4DCEB",
+"' 	c #C5DCEC",
+") 	c #C5DDEC",
+"! 	c #C6DDEC",
+"~ 	c #87B7D6",
+"{ 	c #5E98BD",
+"] 	c #727D85",
+"^ 	c #3988BB",
+"/ 	c #79AED1",
+"( 	c #A7CBE1",
+"_ 	c #B6D4E6",
+": 	c #B7D4E6",
+"< 	c #B0C7D6",
+"[ 	c #B3B2B3",
+"} 	c #969798",
+"| 	c #2379AF",
+"1 	c #2F83B7",
+"2 	c #86B7D6",
+"3 	c #A2C8E0",
+"4 	c #A3C9E0",
+"5 	c #A4C9E0",
+"6 	c #A5C9E0",
+"7 	c #A5C9E1",
+"8 	c #B5C4CE",
+"9 	c #D0CFCF",
+"0 	c #A7A7A6",
+"a 	c #343738",
+"b 	c #2679AE",
+"c 	c #2A7FB5",
+"d 	c #63A3CA",
+"e 	c #92BFDA",
+"f 	c #93BFDA",
+"g 	c #92BEDA",
+"h 	c #92BED9",
+"i 	c #B2BABF",
+"j 	c #C7C6C5",
+"k 	c #A1A1A0",
+"l 	c #666767",
+"m 	c #2D3032",
+"n 	c #257BB2",
+"o 	c #3A8ABC",
+"p 	c #75ADD0",
+"q 	c #84B6D5",
+"r 	c #83B6D5",
+"s 	c #83B5D4",
+"t 	c #83B5D5",
+"u 	c #86B4D0",
+"v 	c #AEB1B3",
+"w 	c #B4B4B3",
+"x 	c #8A8A8A",
+"y 	c #787878",
+"z 	c #424242",
+"A 	c #495155",
+"B 	c #2174A8",
+"C 	c #257DB4",
+"D 	c #418EBF",
+"E 	c #6CA8CD",
+"F 	c #71ABCE",
+"G 	c #72ABCF",
+"H 	c #71AACE",
+"I 	c #71ABCF",
+"J 	c #7FA5BE",
+"K 	c #ACADAE",
+"L 	c #909090",
+"M 	c #737373",
+"N 	c #707070",
+"O 	c #585859",
+"P 	c #406982",
+"Q 	c #267AAF",
+"R 	c #206EA0",
+"S 	c #2275A9",
+"T 	c #2479AF",
+"U 	c #3C89BB",
+"V 	c #5D9EC7",
+"W 	c #62A1C9",
+"X 	c #62A2C9",
+"Y 	c #63A2C9",
+"Z 	c #7998AD",
+"` 	c #A6A6A6",
+" .	c #717070",
+"..	c #636363",
+"+.	c #656565",
+"@.	c #56636B",
+"#.	c #3078A6",
+"$.	c #287CB3",
+"%.	c #2374A8",
+"&.	c #327AA9",
+"*.	c #2778AC",
+"=.	c #2477AC",
+"-.	c #307FB2",
+";.	c #4A91BE",
+">.	c #5297C2",
+",.	c #5197C3",
+"'.	c #5096C3",
+").	c #5298C4",
+"!.	c #5197C4",
+"~.	c #5397C2",
+"{.	c #798F9F",
+"].	c #8E8C8A",
+"^.	c #5A5958",
+"/.	c #545454",
+"(.	c #595B5C",
+"_.	c #426E8A",
+":.	c #287DB3",
+"<.	c #297FB6",
+"[.	c #2375AA",
+"}.	c #407BA3",
+"|.	c #528FB8",
+"1.	c #4288B5",
+"2.	c #2B7AAC",
+"3.	c #2678AB",
+"4.	c #3380B1",
+"5.	c #3F8AB9",
+"6.	c #3F8BBB",
+"7.	c #408BBC",
+"8.	c #3F8BBC",
+"9.	c #3E8BBC",
+"0.	c #408CBD",
+"a.	c #418DBE",
+"b.	c #418DBD",
+"c.	c #3E8CBD",
+"d.	c #408DBE",
+"e.	c #458CB9",
+"f.	c #8A9C9E",
+"g.	c #B8AD8C",
+"h.	c #6F634B",
+"i.	c #4E4C49",
+"j.	c #485A66",
+"k.	c #2D78A8",
+"l.	c #297FB7",
+"m.	c #226A98",
+"n.	c #427FA7",
+"o.	c #5994BC",
+"p.	c #5995BD",
+"q.	c #498CB8",
+"r.	c #2D7BAD",
+"s.	c #2476AA",
+"t.	c #2D7CAE",
+"u.	c #2F7FB2",
+"v.	c #2F81B5",
+"w.	c #3082B6",
+"x.	c #2E81B6",
+"y.	c #3083B7",
+"z.	c #2F82B7",
+"A.	c #3183B8",
+"B.	c #3284B8",
+"C.	c #3184B8",
+"D.	c #3584B5",
+"E.	c #AFC1B2",
+"F.	c #D3BD84",
+"G.	c #907138",
+"H.	c #595040",
+"I.	c #366B8C",
+"J.	c #287EB6",
+"K.	c #297EB5",
+"L.	c #236B9A",
+"M.	c #1D557A",
+"N.	c #1B5376",
+"O.	c #4783AB",
+"P.	c #5C96BC",
+"Q.	c #5C96BE",
+"R.	c #5E98BF",
+"S.	c #5593BC",
+"T.	c #3780B0",
+"U.	c #2777AA",
+"V.	c #2677AA",
+"W.	c #2779AD",
+"X.	c #287CB2",
+"Y.	c #297DB3",
+"Z.	c #287DB4",
+"`.	c #297EB4",
+" +	c #2A7EB5",
+".+	c #4B8CAF",
+"++	c #C6C6A4",
+"@+	c #AE8F4F",
+"#+	c #8A7341",
+"$+	c #446E7F",
+"%+	c #2B7FB5",
+"&+	c #2571A1",
+"*+	c #195072",
+"=+	c #1B4F70",
+"-+	c #1A5073",
+";+	c #4A85AC",
+">+	c #5B95BC",
+",+	c #5C95BD",
+"'+	c #5E97BD",
+")+	c #5F97BE",
+"!+	c #5B95BD",
+"~+	c #4086B3",
+"{+	c #2978AA",
+"]+	c #2476A8",
+"^+	c #2577AB",
+"/+	c #277AAF",
+"(+	c #277CB1",
+"_+	c #297DB2",
+":+	c #2A7EB3",
+"<+	c #297EB3",
+"[+	c #2B7EB3",
+"}+	c #709BA6",
+"|+	c #CEBC86",
+"1+	c #9A7737",
+"2+	c #727964",
+"3+	c #317DAB",
+"4+	c #2A80B6",
+"5+	c #287DB2",
+"6+	c #1D567B",
+"7+	c #194C6C",
+"8+	c #1B4D6D",
+"9+	c #194D6F",
+"0+	c #4D86AD",
+"a+	c #6097BD",
+"b+	c #6198BE",
+"c+	c #6399BE",
+"d+	c #639ABF",
+"e+	c #6299BF",
+"f+	c #629ABF",
+"g+	c #4C8DB6",
+"h+	c #2C7AAB",
+"i+	c #2878A9",
+"j+	c #2B7AAB",
+"k+	c #2F7FB0",
+"l+	c #3181B3",
+"m+	c #3382B4",
+"n+	c #3383B5",
+"o+	c #3382B5",
+"p+	c #3985B3",
+"q+	c #ADBAA6",
+"r+	c #C2A86C",
+"s+	c #9E824C",
+"t+	c #5B726E",
+"u+	c #2D81B5",
+"v+	c #2D81B6",
+"w+	c #27709D",
+"x+	c #1D4F6E",
+"y+	c #1D4D6C",
+"z+	c #1F4F6E",
+"A+	c #1C4F70",
+"B+	c #4E86AB",
+"C+	c #6499BD",
+"D+	c #659ABE",
+"E+	c #679BBF",
+"F+	c #679CBF",
+"G+	c #689CC0",
+"H+	c #689DC0",
+"I+	c #5D96BC",
+"J+	c #3E84B0",
+"K+	c #3A82AF",
+"L+	c #3D85B1",
+"M+	c #4189B5",
+"N+	c #438BB8",
+"O+	c #438BB9",
+"P+	c #428BB9",
+"Q+	c #6298B5",
+"R+	c #E2D3A4",
+"S+	c #AD9054",
+"T+	c #A28F63",
+"U+	c #52767F",
+"V+	c #3080B2",
+"W+	c #2A6991",
+"X+	c #224F6B",
+"Y+	c #214D68",
+"Z+	c #23506C",
+"`+	c #265471",
+" @	c #205677",
+".@	c #4982A7",
+"+@	c #679ABD",
+"@@	c #699CBF",
+"#@	c #6A9DC0",
+"$@	c #6B9EC0",
+"%@	c #6B9EC1",
+"&@	c #6D9FC1",
+"*@	c #70A1C2",
+"=@	c #74A3C4",
+"-@	c #6B9FC1",
+";@	c #5291B8",
+">@	c #4D8DB5",
+",@	c #5090B8",
+"'@	c #5292BB",
+")@	c #5394BE",
+"!@	c #5193BE",
+"~@	c #94ADAD",
+"{@	c #CDBA8B",
+"]@	c #AF9562",
+"^@	c #A2926C",
+"/@	c #56757B",
+"(@	c #2E6587",
+"_@	c #264D65",
+":@	c #264E65",
+"<@	c #285571",
+"[@	c #2F6689",
+"}@	c #306C92",
+"|@	c #276993",
+"1@	c #2A6C96",
+"2@	c #4485AE",
+"3@	c #528EB5",
+"4@	c #6197BB",
+"5@	c #699DBF",
+"6@	c #6D9FC0",
+"7@	c #75A3C3",
+"8@	c #79A6C5",
+"9@	c #7FA9C8",
+"0@	c #83ADCA",
+"a@	c #7CA9C7",
+"b@	c #6299BD",
+"c@	c #5E98BC",
+"d@	c #6099BE",
+"e@	c #609CC1",
+"f@	c #619CC1",
+"g@	c #C1C6B4",
+"h@	c #C3AD7D",
+"i@	c #B39D70",
+"j@	c #9B8457",
+"k@	c #5C655D",
+"l@	c #315265",
+"m@	c #2C4F64",
+"n@	c #305D78",
+"o@	c #397BA5",
+"p@	c #3E87B5",
+"q@	c #3A85B4",
+"r@	c #276F9C",
+"s@	c #20618B",
+"t@	c #377BA6",
+"u@	c #3C80AB",
+"v@	c #3D81AC",
+"w@	c #4586AF",
+"x@	c #558FB5",
+"y@	c #6E9FC0",
+"z@	c #7CA8C6",
+"A@	c #87AFCB",
+"B@	c #8DB3CD",
+"C@	c #90B5CF",
+"D@	c #8BB3CE",
+"E@	c #74A5C4",
+"F@	c #6FA2C3",
+"G@	c #6EA2C3",
+"H@	c #7DAAC4",
+"I@	c #D4D0B5",
+"J@	c #B39969",
+"K@	c #9E885E",
+"L@	c #767260",
+"M@	c #4E6169",
+"N@	c #3D596A",
+"O@	c #396078",
+"P@	c #4082AC",
+"Q@	c #448DBA",
+"R@	c #458DBB",
+"S@	c #3C85B4",
+"T@	c #266791",
+"U@	c #265D81",
+"V@	c #3678A2",
+"W@	c #4384AC",
+"X@	c #4484AD",
+"Y@	c #4887AF",
+"Z@	c #5590B5",
+"`@	c #6399BB",
+" #	c #75A4C3",
+".#	c #8CB3CD",
+"+#	c #97BAD2",
+"@#	c #9CBDD4",
+"##	c #92B8D0",
+"$#	c #7DABC8",
+"%#	c #7BAAC7",
+"&#	c #95B6C6",
+"*#	c #CEC4A6",
+"=#	c #A5926D",
+"-#	c #787E77",
+";#	c #556874",
+">#	c #4C6271",
+",#	c #455E6E",
+"'#	c #467593",
+")#	c #488EBA",
+"!#	c #488FBB",
+"~#	c #488EBB",
+"{#	c #387FAC",
+"]#	c #2D6181",
+"^#	c #2C6E98",
+"/#	c #4686AF",
+"(#	c #4C8BB3",
+"_#	c #4D8BB2",
+":#	c #508CB2",
+"<#	c #5B93B7",
+"[#	c #6198BA",
+"}#	c #699DBE",
+"|#	c #73A3C2",
+"1#	c #85AFCA",
+"2#	c #9DBED4",
+"3#	c #A6C4D8",
+"4#	c #8AB3CD",
+"5#	c #A9BFC4",
+"6#	c #BDB295",
+"7#	c #848E8C",
+"8#	c #657884",
+"9#	c #5F7B8D",
+"0#	c #5E87A0",
+"a#	c #5B8DAD",
+"b#	c #5491B7",
+"c#	c #5293BC",
+"d#	c #5193BD",
+"e#	c #4B8EB8",
+"f#	c #30729C",
+"g#	c #2C6385",
+"h#	c #3E7FA7",
+"i#	c #508EB5",
+"j#	c #528FB6",
+"k#	c #5792B8",
+"l#	c #6098BA",
+"m#	c #669BBD",
+"n#	c #6D9FBF",
+"o#	c #74A4C2",
+"p#	c #7BA8C5",
+"q#	c #86B0CA",
+"r#	c #9ABCD2",
+"s#	c #AAC7D9",
+"t#	c #9BBDD3",
+"u#	c #AFBCBC",
+"v#	c #9FA49C",
+"w#	c #748A99",
+"x#	c #7296AE",
+"y#	c #70A3C3",
+"z#	c #69A1C4",
+"A#	c #629CC1",
+"B#	c #5B98BF",
+"C#	c #5695BD",
+"D#	c #5494BC",
+"E#	c #4183AD",
+"F#	c #326686",
+"G#	c #316E95",
+"H#	c #508DB3",
+"I#	c #5893B8",
+"J#	c #5C95B9",
+"K#	c #659CBE",
+"L#	c #6CA0C1",
+"M#	c #72A3C3",
+"N#	c #79A8C5",
+"O#	c #7FAAC6",
+"P#	c #87B0CA",
+"Q#	c #8DB4CC",
+"R#	c #96BAD1",
+"S#	c #9FBFD4",
+"T#	c #A6B5B8",
+"U#	c #8BA0AC",
+"V#	c #7FA7C0",
+"W#	c #7AAAC8",
+"X#	c #75A7C7",
+"Y#	c #6FA3C5",
+"Z#	c #69A0C3",
+"`#	c #609BC0",
+" $	c #5C98BF",
+".$	c #5392B9",
+"+$	c #367298",
+"@$	c #2E5A76",
+"#$	c #39779F",
+"$$	c #5E97BA",
+"%$	c #669CBD",
+"&$	c #6CA0C0",
+"*$	c #72A4C3",
+"=$	c #79A8C6",
+"-$	c #7EACC8",
+";$	c #83AEC9",
+">$	c #87B0C9",
+",$	c #8AB1CA",
+"'$	c #8BB2CA",
+")$	c #8BB0C6",
+"!$	c #84AEC8",
+"~$	c #7EABC7",
+"{$	c #7AA9C7",
+"]$	c #6EA3C4",
+"^$	c #689FC2",
+"/$	c #619BBF",
+"($	c #5794BA",
+"_$	c #3C7AA2",
+":$	c #335B76",
+"<$	c #2F6181",
+"[$	c #407EA5",
+"}$	c #5C95B8",
+"|$	c #689DBF",
+"1$	c #6EA1C1",
+"2$	c #73A4C3",
+"3$	c #82AEC9",
+"4$	c #85B0CA",
+"5$	c #86B0C9",
+"6$	c #85AEC9",
+"7$	c #82ADC8",
+"8$	c #7DAAC6",
+"9$	c #7AA8C6",
+"0$	c #70A4C5",
+"a$	c #6AA0C3",
+"b$	c #5E97BB",
+"c$	c #417FA6",
+"d$	c #346280",
+"e$	c #316180",
+"f$	c #407CA2",
+"g$	c #6298BA",
+"h$	c #7CAAC8",
+"i$	c #80ADC9",
+"j$	c #83AFCA",
+"k$	c #84AFCA",
+"l$	c #7FABC6",
+"m$	c #7CA9C5",
+"n$	c #79A7C5",
+"o$	c #76A7C6",
+"p$	c #70A3C4",
+"q$	c #649ABD",
+"r$	c #417CA2",
+"s$	c #35627F",
+"t$	c #325A74",
+"u$	c #3B7498",
+"v$	c #568EB1",
+"w$	c #6EA0BF",
+"x$	c #78A7C5",
+"y$	c #7CAAC7",
+"z$	c #7EACC9",
+"A$	c #81AECA",
+"B$	c #81ADC9",
+"C$	c #80ACC7",
+"D$	c #7EAAC6",
+"E$	c #7BA8C4",
+"F$	c #76A5C2",
+"G$	c #6EA1C0",
+"H$	c #578FB3",
+"I$	c #3D7598",
+"J$	c #365B73",
+"K$	c #3D5B6D",
+"L$	c #366683",
+"M$	c #3E799F",
+"N$	c #5D93B5",
+"O$	c #71A1C0",
+"P$	c #7DAAC7",
+"Q$	c #7EABC8",
+"R$	c #78A6C2",
+"S$	c #6F9EBC",
+"T$	c #5B90B1",
+"U$	c #3F799E",
+"V$	c #396683",
+"W$	c #415B6C",
+"X$	c #475A68",
+"Y$	c #345F7C",
+"Z$	c #32698C",
+"`$	c #40779B",
+" %	c #4B81A3",
+".%	c #5086A7",
+"+%	c #3F7799",
+"@%	c #32688A",
+"#%	c #365F79",
+"$%	c #495B66",
+"%%	c #455965",
+"&%	c #3C596B",
+"*%	c #39596E",
+"=%	c #3D596B",
+"-%	c #465964",
+"                                                                ",
+"                                                                ",
+"                        . + @ # $ % & *                         ",
+"                  = - ; > , ' ) ! ! , > ~ { ]                   ",
+"                ^ / ( _ : _ : _ _ : : : : < [ }                 ",
+"            | 1 2 3 4 5 6 7 7 7 7 7 5 4 4 8 9 0 a               ",
+"          b c d e f g e f f f f f f f g h i j k l m             ",
+"          n o p q r r r r s q q s s t s u v w x y z A           ",
+"        B C D E F G H H F F I F H H G H J K L M N O P Q         ",
+"      R S T U V W W W X W X W W X W Y W Z `  ...+.@.#.$.%.      ",
+"      &.*.=.-.;.>.,.'.,.).).!.,.).).).~.{.].^./.(._.:.<.[.      ",
+"    }.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.a.e.f.g.h.i.j.k.l.:.m.      ",
+"    n.o.p.q.r.s.t.u.v.w.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.    ",
+"    O.P.Q.R.S.T.U.V.W.X.$.Y.Z.`.c K. +.+++@+#+$+%+l.&+*+=+-+    ",
+"    ;+>+,+'+)+!+~+{+]+^+/+(+X._+:+<+[+}+|+1+2+3+4+5+6+7+8+9+    ",
+"    0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+    ",
+"    B+C+D+E+F+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @    ",
+"    .@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@    ",
+"    1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@    ",
+"    s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@    ",
+"    U@V@W@X@2@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#    ",
+"      ^#/#(#_#:#<#[#}#|#1#2#3#2#4#5#6#7#8#9#0#a#b#c#d#e#f#      ",
+"      g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#      ",
+"        G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$        ",
+"        @$#$Z@$$%$&$*$=$-$;$>$,$'$)$!$~${$X#]$^$/$($_$:$        ",
+"          <$[$}$|$1$2$=$$#3$4$q#5$6$7$8$9$X#0$a$b$c$d$          ",
+"            e$f$g$1$E@=$h$i$j$k$;$7$l$m$n$o$p$q$r$s$            ",
+"              t$u$v$w$x$y$z$i$A$B$C$D$E$F$G$H$I$J$              ",
+"                K$L$M$N$O$n$P$Q$Q$8$R$S$T$U$V$W$                ",
+"                    X$Y$Z$`$ %.%.% %+%@%#%$%                    ",
+"                          %%&%*%*%=%-%                          ",
+"                                                                "};