git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@433 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_client.py

@@ -45,6 +45,34 @@ imp_cl_help = cl_utils2.cl_help
 # Форматированный вывод
 imp_cl_smcon = cl_utils2.cl_smartcon
 
+class newClass:
+    """Класс для создания новых классов"""
+    def createNewClass(self, name, bases, attrs={}):
+        """Создает объект нового класса
+
+        createNewClass(self, name, bases, attrs)
+        name - имя класса - str,
+        bases - cписок наследуемых классов - (tuple),
+        attrs - аттрибуты класса - {dict}
+        """
+        class newMethod:
+            #Объединяем конфигурации
+            def join(self, newObj):
+                if newObj.__class__.__name__ == self.__class__.__name__:
+                    self.docObj.joinDoc(newObj.doc)
+        attrsNew = {}
+        attrsNew["configName"] = name
+        if attrs:
+            for key in attrs.keys():
+               attrsNew[key] = attrs[key]
+        newCl = type(name, bases + (newMethod, object,), attrsNew)
+        return newCl
+
+class printNoColor:
+    def colorPrint(self,attr,fg,bg,string):
+        sys.stdout.write(string)
+
+
 class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
     """Основной класс для работы с LDAP"""
     def __init__(self, cmdName):
@@ -154,6 +182,13 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
          'helpChapter':_("Common options"),
          'help':_("print variables (TYPE_VAR - all:full var)")
         },
+        {'progAccess':(0,1,2),
+         'longOption':"color",
+         'optVal':_("WHEN"),
+         'helpChapter':_("Common options"),
+         'help':_("control whether color is used to distinguish file types. \
+WHEN may be 'never', 'always', or 'auto'")
+        },
         {'progAccess':(0,),
          'longOption':"mount",
          'helpChapter':_("Common options"),

scripts/cl-client

@@ -39,6 +39,12 @@ if __name__ == "__main__":
         else:
             clVars.printVars(terms)
     elif not optObj.flagHelp:
+        if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
+                nwClObj = cl_client.newClass()
+                newClass = nwClObj.createNewClass("cl_clientnocolor",
+                                      (cl_client.printNoColor,
+                                      cl_client.cl_client))
+                ldapObj = newClass("cl-client")
         if optObj.params.has_key('user'):
             if not optObj.opt.has_key('r') or not optObj.opt.has_key('mount'):
                 domain = optObj.params['user']

scripts/cl-createhome

@@ -40,6 +40,12 @@ if __name__ == "__main__":
             clVars.printVars(terms)
     elif not optObj.flagHelp and optObj.params.has_key('user'):
         userName = optObj.params['user'].strip()
+        if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
+            nwClObj = cl_client.newClass()
+            newClass = nwClObj.createNewClass("cl_clientnocolor",
+                                      (cl_client.printNoColor,
+                                      cl_client.cl_client))
+            ldapObj = newClass("cl-createhome")
         if not ldapObj.createHome(userName):
             flagError = True
     if flagError:

scripts/cl-sync

@@ -40,6 +40,12 @@ if __name__ == "__main__":
             clVars.printVars(terms)
     elif not optObj.flagHelp:
         if optObj.params.has_key('user') and optObj.opt:
+            if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
+                nwClObj = cl_client.newClass()
+                newClass = nwClObj.createNewClass("cl_clientnocolor",
+                                      (cl_client.printNoColor,
+                                      cl_client.cl_client))
+                ldapObj = newClass("cl-sync")
             if optObj.opt.has_key('login'):
                 userName = optObj.params['user']
                 if not ldapObj.mountUserRes(userName):