making portable mode work, moving src/* to outside, moving django and glade to ui, and other fixes

Author: ilius

src/django/__init__.py renamed to __init__.py

@@ -23,36 +23,19 @@
 homePage = 'http://sourceforge.net/projects/pyglossary'
 
 import os, sys, platform, time, subprocess, shutil, re
-from os.path import split, join, splitext, isdir
+from os.path import split, join, splitext, isdir, dirname
 
 from text_utils import myRaise, printAsError, faEditStr, replacePostSpaceChar, removeTextTags,\
                        takeStrWords, findWords, findAll, addDefaultOptions
 
 import warnings
 warnings.resetwarnings() ## ??????
 
-srcDir = ''
-if __file__:
-    srcDir = os.path.dirname(os.path.realpath(__file__))
-if not srcDir:
-    srcDir = '/usr/share/pyglossary'
-rootDir = os.path.dirname(srcDir)
+_myDir = dirname(__file__)
 
-aboutText = open(join(rootDir, 'about')).read()
-licenseText = open(join(rootDir, 'license')).read()
 
-logo = join(rootDir, 'res/pyglossary.png')
 
-if sys.version_info[:2] == (2, 5): ## ???????????????????????
-    libDir = join(rootDir, 'dependencies', 'py2.5-lib')
-    if isdir(libDir):
-        sys.path.append(libDir)
-    ########
-    libDir = join(rootDir, 'lib')
-    if isdir(libDir):
-        sys.path.append(libDir)
-
-plugDir = join(rootDir, 'plugins')
+plugDir = join(_myDir, 'plugins')
 if isdir(plugDir):
     sys.path.append(plugDir)
 else:
@@ -282,7 +265,7 @@ def read(self, filename, format='', **options):
                     delFile = True
             elif ext=='.zip':
                 (output, error) = subprocess.Popen(
-                    ['unzip', filename, '-d', os.path.dirname(filename)],
+                    ['unzip', filename, '-d', dirname(filename)],
                     stdout=subprocess.PIPE
                 ).communicate()
                 if error:

src/about renamed to about

@@ -0,0 +1,189 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+## ui_main.py 
+##
+## Copyright © 2008-2010 Saeed Rasooli <[email protected]>    (ilius)
+## This file is part of PyGlossary project, http://sourceforge.net/projects/pyglossary/
+##
+## This program is a free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program. Or on Debian systems, from /usr/share/common-licenses/GPL
+## If not, see <http://www.gnu.org/licenses/gpl.txt>.
+
+import os, sys, getopt, __builtin__
+from pyglossary.glossary import confPath, VERSION
+#from pyglossary.text_utils import printAsError ## No red color, plain
+from os.path import dirname, join
+
+try:
+    import ui
+except ImportError:
+    sys.path.append(join(dirname(dirname(__file__)), 'share', 'pyglossary', 'ui'))
+
+from ui_cmd import COMMAND, printAsError, help, parseFormatOptionsStr
+
+
+def dashToCamelCase(text):## converts "hello-PYTHON-user" to "helloPythonUser"
+    parts = text.split('-')
+    parts[0] = parts[0].lower()
+    for i in range(1, len(parts)):
+        parts[i] = parts[i].capitalize()
+    return ''.join(parts)
+
+use_psyco_file = '%s_use_psyco'%confPath
+psyco_found = None
+
+
+ui_list = ('gtk', 'tk', 'qt')
+
+#print('PyGlossary %s'%VERSION)
+
+if os.path.isfile(use_psyco_file):
+    try:
+        import psyco
+    except ImportError:
+        print('Warning: module "psyco" not found. It could speed up execution.')
+        psyco_found = False
+    else:
+        psyco.full()
+        print('Using module "psyco" to speed up execution.')
+        psyco_found = True
+
+available_options = [
+    'version',
+    'help',
+    'ui=',
+    'read-options=',
+    'write-options=', 
+    'read-format=',
+    'write-format=',
+    'reverse',
+    'no-progress-bar',
+]
+
+## no-progress-bar only for command line UI
+## FIXME: load ui-dependent available options from ui modules (for example ui_cmd.available_options)
+## the only problem is that it has to "import gtk" before it get the "ui_gtk.available_options"
+
+try:
+    (options, arguments) = getopt.gnu_getopt(
+        sys.argv[1:],
+        'vhu:r:w:',
+        available_options,
+    )
+except getopt.GetoptError:
+    printAsError(sys.exc_info()[1])
+    print 'try: %s --help'%COMMAND
+    sys.exit(1)
+
+"""
+ui_type: User interface type
+Possible values:
+    cmd - Command line interface, this ui will automatically selected if you give both input and output file
+    gtk - GTK interface
+    tk - Tkinter interface
+    qt - Qt interface
+    auto - Use the first available UI
+"""
+
+ui_type = 'auto'
+
+if len(arguments)<1:## open GUI
+    ipath = opath = ''
+elif len(arguments)==1:## open GUI, in edit mode (if gui support, like DB Editor in ui_gtk)
+    ipath = arguments[0]
+    opath = ''
+else:## run the commnad line interface
+    ui_type = 'cmd'
+    ipath = arguments[0]
+    opath = arguments[1]
+
+
+read_format = '' ## only used in ui_cmd for now
+write_format = '' ## only used in ui_cmd for now
+read_options = {} ## only used in ui_cmd for now
+write_options = {} ## only used in ui_cmd for now
+reverse = False ## only used in ui_cmd for now
+ui_options = {}
+
+
+'''
+    examples for read and write options:
+    --read-options testOption=stringValue
+    --read-options enableFoo=True
+    --read-options fooList=[1,2,3]
+    --read-options 'fooList=[1, 2, 3]'
+    --read-options 'testOption=stringValue; enableFoo=True; fooList=[1, 2, 3]'
+    --read-options 'testOption=stringValue;enableFoo=True;fooList=[1,2,3]'
+'''
+
+
+for (opt, opt_arg) in options:
+    if opt in ('-v', '--version'):
+        print('PyGlossary %s'%VERSION)
+        sys.exit(0)
+    elif opt in ('-h', '--help'):
+        help()
+        sys.exit(0)
+    elif opt in ('-u', '--ui'):
+        if opt_arg in ui_list:
+            ui_type = opt_arg
+        else:
+            printAsError('invalid ui type %s'%opt_arg)
+    elif opt in ('-r', '--read-options'):
+        read_options = parseFormatOptionsStr(opt_arg)
+    elif opt in ('-w', '--write-options'):
+        write_options = parseFormatOptionsStr(opt_arg)
+    elif opt == '--read-format':
+        read_format = opt_arg
+    elif opt == '--write-format':
+        write_format = opt_arg
+    elif opt == '--reverse':
+        reverse = True
+    elif opt.startswith('--'):
+        ui_options[dashToCamelCase(opt[2:])] = opt_arg ## opt_arg is not None, UI just ignores None value
+
+
+## FIXME
+## -v (verbose or version?)
+## -r (reverse or read-options)
+
+
+if ui_type == 'cmd':
+    import ui_cmd
+    sys.exit(ui_cmd.UI(**ui_options).run(
+        ipath,
+        opath=opath,
+        read_format=read_format,
+        write_format=write_format, 
+        read_options=read_options,
+        write_options=write_options, 
+        reverse=reverse,
+    ))
+else:
+    if ui_type=='auto':
+        ui_module = None
+        for ui_type2 in ui_list:
+            try:
+                ui_module = getattr(__import__('ui.ui_%s'%ui_type2), 'ui_%s'%ui_type2)
+            except ImportError:
+                pass
+            else:
+                break
+        if ui_module==None:
+            printAsError('no user interface module found!')
+            sys.exit(1)
+    else:
+        ui_module = getattr(__import__('ui.ui_%s'%ui_type), 'ui_%s'%ui_type)
+    sys.exit(ui_module.UI(ipath, **ui_options).run())
+    ## don't forget to append "**options" at every UI.__init__ arguments
+