[Uludag-commits] r11923 - trunk/bocek/src

[svn-uludag at uludag.org.tr]

Author: gokmen.goksel
Date: Wed Jan 10 17:04:44 2007
New Revision: 11923

Modified:
   trunk/bocek/src/bocek.py
   trunk/bocek/src/consts.py
Log:
az kaldı ;)

Modified: trunk/bocek/src/bocek.py
=================================================================
--- trunk/bocek/src/bocek.py	(original)
+++ trunk/bocek/src/bocek.py	Wed Jan 10 17:04:44 2007
@@ -33,6 +33,12 @@
     about_data.addAuthor('Gökmen GÖKSEL', None, 'gokmen at pardus.org.tr')
     return about_data
 
+def arrayToStr(ar):
+    ret=''
+    for line in ar:
+        ret+=line
+    return ret
+
 class HelpDialog(QDialog):
     def __init__(self, parent=None):
         QDialog.__init__(self, parent)
@@ -58,7 +64,18 @@
         guiApp.quit()
 
     def buildReport(self):
-        pass
+        self.output=""
+        logs = self.getCheckedLogs()
+        # self.output ="From : %s (%s) at %s\n"%(lineEmail.text(),getIp,time)
+        self.output+="Summary : %s \n" % self.lineSummary.text()
+        self.output+="Details : %s \n" % self.lineDetails.text()
+        self.output+="\nAdditional Files : \n%s\n"%("*"*40)
+        #FIX
+        for log in logs:
+            self.output+="\n========» %s «========\n" % logs
+            self.output+=self.getStaticOutput(logs)
+            self.output+="\n"#+("="*40)+"\n"
+        print self.writeReport()
 
     def writeReport(self):
         now = time.localtime()
@@ -70,16 +87,25 @@
 
     def getStaticOutput(self,filename):
         link = file(filename,'r')
-        ret = ''
         lines = link.readlines()
-        for line in lines:
-            ret+=line
         link.close()
-        return ret
+        return arrayToStr(lines)
 
     def getCommandOutput(self,cmd):
         return subprocess.call(cmd)
 
+    def getCheckedLogs(self):
+        ret=[]
+        if self.checkBoxPackages.isChecked():
+            ret.append(consts.packageInfo)
+        if self.checkBoxConfig.isChecked():
+            ret.append(consts.configFiles)
+        if self.checkBoxHardware.isChecked():
+            ret.append(consts.hardwareInfo)
+        if self.checkBoxStandartLogs.isChecked():
+            ret.append(consts.standartLogs)
+        return ret
+
     def slotHelp(self):
         self.helpwin = HelpDialog(self)
         self.helpwin.show()

Modified: trunk/bocek/src/consts.py
=================================================================
--- trunk/bocek/src/consts.py	(original)
+++ trunk/bocek/src/consts.py	Wed Jan 10 17:04:44 2007
@@ -3,7 +3,6 @@
 standartLogs= {"/var/log/comar.log"         :1,
                "/var/log/user.log"          :1,
                "/var/log/Xorg.0.log"        :1,
-               "/var/log/xlog"              :1,
                "/bin/dmesg"                 :2,
                "/usr/bin/uname -a"          :2}
 hardwareInfo= {"/bin/mount"                 :2,