[PC-BSD Commits] r2942 - in pcbsd: branches/7.0/SystemUpdater trunk/SystemUpdater

[svn at pcbsd.org]

Author: kris
Date: 2008-10-29 13:42:41 -0700 (Wed, 29 Oct 2008)
New Revision: 2942

Modified:
   pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp
   pcbsd/branches/7.0/SystemUpdater/UpdaterTray.h
   pcbsd/trunk/SystemUpdater/UpdaterTray.cpp
   pcbsd/trunk/SystemUpdater/UpdaterTray.h
Log:

Little more code cleanup for the system updater enhancements. Seems to work much nicer now, proxy support has been tested
here as well, works also. 



Modified: pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp
===================================================================
--- pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp	2008-10-29 19:55:33 UTC (rev 2941)
+++ pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp	2008-10-29 20:42:41 UTC (rev 2942)
@@ -1759,58 +1759,12 @@
 
 
 
-// Read the results to see if this PBI needs an Update
-void UpdaterTray::slotReadPBIStatusResults()
-{
-    
-    QString line;
-
-
-    while( checkPBIProc->canReadLineStdout() )
-    {
-        line = checkPBIProc->readLineStdout();
-        if (line.find("NewVer:" ) ==  0 )
-        {
-            PBIProgNewVer[currentWorkingPBI] = line.replace("NewVer: ", "");
-        }
-        if ( line.find("FileURL1:") == 0)
-        {
-            PBIProgURL1[currentWorkingPBI] = line.replace("FileURL1: ", "");
-            // We have valid data! Set the flag that this PBI is in need of an update
-            PBIProgUpdate[currentWorkingPBI] = 1;
-            //QMessageBox::critical( 0, tr("Online Update"), "Found update to:" + PBIProgName[currentWorkingPBI], QMessageBox::Ok );
-        }
-        // Check for our other file locations
-        if ( line.find("FileURL2:") == 0)
-        {
-            PBIProgURL2[currentWorkingPBI] = line.replace("FileURL2: ", "");
-        }
-        if ( line.find("FileURL3:") == 0)
-        {
-            PBIProgURL3[currentWorkingPBI] = line.replace("FileURL3: ", "");
-        }
-        if ( line.find("MD5:") == 0)
-        {
-            PBIProgMD5[currentWorkingPBI] = line.replace("MD5: ", "");
-        }
-
-    }
-
-}
-
-
-
-
 // The update checking is finished, now see if we have any PBIs which need an update
 void UpdaterTray::slotPopulatePBIList()
 {
   int i = 0, foundUpdates = 0;
   QString text, tmp, newMsg, ProgDirName, iconPath;
 
-
-
-
-
     while (! PBIProgName[i].isEmpty() )
     {
        // Add the PBI info to the GUI

Modified: pcbsd/branches/7.0/SystemUpdater/UpdaterTray.h
===================================================================
--- pcbsd/branches/7.0/SystemUpdater/UpdaterTray.h	2008-10-29 19:55:33 UTC (rev 2941)
+++ pcbsd/branches/7.0/SystemUpdater/UpdaterTray.h	2008-10-29 20:42:41 UTC (rev 2942)
@@ -43,7 +43,6 @@
    void slotStartCheckAvailSysSpace();
    void slotStartPBIUpdateCheck();
    void slotPBICheckUpdate();
-   void slotReadPBIStatusResults();
    void slotPopulatePBIList();
    void slotStartPBIUpgrades();
    void slotDownloadPBIUpdate();

Modified: pcbsd/trunk/SystemUpdater/UpdaterTray.cpp
===================================================================
--- pcbsd/trunk/SystemUpdater/UpdaterTray.cpp	2008-10-29 19:55:33 UTC (rev 2941)
+++ pcbsd/trunk/SystemUpdater/UpdaterTray.cpp	2008-10-29 20:42:41 UTC (rev 2942)
@@ -1759,58 +1759,12 @@
 
 
 
-// Read the results to see if this PBI needs an Update
-void UpdaterTray::slotReadPBIStatusResults()
-{
-    
-    QString line;
-
-
-    while( checkPBIProc->canReadLineStdout() )
-    {
-        line = checkPBIProc->readLineStdout();
-        if (line.find("NewVer:" ) ==  0 )
-        {
-            PBIProgNewVer[currentWorkingPBI] = line.replace("NewVer: ", "");
-        }
-        if ( line.find("FileURL1:") == 0)
-        {
-            PBIProgURL1[currentWorkingPBI] = line.replace("FileURL1: ", "");
-            // We have valid data! Set the flag that this PBI is in need of an update
-            PBIProgUpdate[currentWorkingPBI] = 1;
-            //QMessageBox::critical( 0, tr("Online Update"), "Found update to:" + PBIProgName[currentWorkingPBI], QMessageBox::Ok );
-        }
-        // Check for our other file locations
-        if ( line.find("FileURL2:") == 0)
-        {
-            PBIProgURL2[currentWorkingPBI] = line.replace("FileURL2: ", "");
-        }
-        if ( line.find("FileURL3:") == 0)
-        {
-            PBIProgURL3[currentWorkingPBI] = line.replace("FileURL3: ", "");
-        }
-        if ( line.find("MD5:") == 0)
-        {
-            PBIProgMD5[currentWorkingPBI] = line.replace("MD5: ", "");
-        }
-
-    }
-
-}
-
-
-
-
 // The update checking is finished, now see if we have any PBIs which need an update
 void UpdaterTray::slotPopulatePBIList()
 {
   int i = 0, foundUpdates = 0;
   QString text, tmp, newMsg, ProgDirName, iconPath;
 
-
-
-
-
     while (! PBIProgName[i].isEmpty() )
     {
        // Add the PBI info to the GUI

Modified: pcbsd/trunk/SystemUpdater/UpdaterTray.h
===================================================================
--- pcbsd/trunk/SystemUpdater/UpdaterTray.h	2008-10-29 19:55:33 UTC (rev 2941)
+++ pcbsd/trunk/SystemUpdater/UpdaterTray.h	2008-10-29 20:42:41 UTC (rev 2942)
@@ -43,7 +43,6 @@
    void slotStartCheckAvailSysSpace();
    void slotStartPBIUpdateCheck();
    void slotPBICheckUpdate();
-   void slotReadPBIStatusResults();
    void slotPopulatePBIList();
    void slotStartPBIUpgrades();
    void slotDownloadPBIUpdate();