Changeset 2941

Timestamp:

10/29/08 12:55:33 (17 months ago)

Author:

kris

Message:

Update to the SystemUpdater? tool, which fixes lots of Proxy issues, and speedup of all KIO calls

Location:

pcbsd

Files:

• branches/7.0/SystemUpdater/SystemUpdater.cpp (modified) (5 diffs)
• branches/7.0/SystemUpdater/SystemUpdater.h (modified) (2 diffs)
• branches/7.0/SystemUpdater/SystemUpdater.ui (modified) (4 diffs)
• branches/7.0/SystemUpdater/UpdaterTray.cpp (modified) (16 diffs)
• branches/7.0/SystemUpdater/UpdaterTray.h (modified) (3 diffs)
• trunk/SystemUpdater/SystemUpdater.cpp (modified) (5 diffs)
• trunk/SystemUpdater/SystemUpdater.h (modified) (2 diffs)
• trunk/SystemUpdater/SystemUpdater.ui (modified) (4 diffs)
• trunk/SystemUpdater/UpdaterTray.cpp (modified) (16 diffs)
• trunk/SystemUpdater/UpdaterTray.h (modified) (3 diffs)

pcbsd/branches/7.0/SystemUpdater/SystemUpdater.cpp

@@ -45 +45 @@
     // Connect the Custom Tmpdir Checkbox
     connect( checkTMPDIR, SIGNAL( clicked() ), this, SLOT( slotCustomTmpClicked() ) );
-    connect( checkProxy, SIGNAL( clicked() ), this, SLOT( slotProxyClicked() ) );
     connect( pushTMPDIR, SIGNAL( clicked() ), this, SLOT( slotSelectCustomTmp() ) );
     connect( pushConfigProxy, SIGNAL( clicked() ), this, SLOT( slotConfigKDEProxy() ) );
@@ -51 +50 @@
     // Connect slots to emit signal when settings change
     connect( lineTMPDIR, SIGNAL( textChanged(const QString &) ), this, SLOT( slotConfigChanged() ) );
-    connect( lineProxyServer, SIGNAL( textChanged(const QString &) ), this, SLOT( slotConfigChanged() ) );
-    connect( spinProxyPort, SIGNAL( valueChanged(const QString &) ), this, SLOT( slotConfigChanged() ) );
     
 }
@@ -450 +447 @@
 }
 
-// Set Proxy Usage
-void systemUpdater::setUseProxy( bool enabled )
-{
-    checkProxy->setChecked(enabled);
-    groupProxySettings->setEnabled(enabled);
-}
-
-// Set the Proxy being used
-void systemUpdater::setUseProxySettings( QString proxyURL, int portnum )
-{
-    lineProxyServer->setText(proxyURL);
-    spinProxyPort->setValue(portnum);
-}
-
-
 bool systemUpdater::getCustomTmpEnabled()
 {
@@ -475 +457 @@
    return lineTMPDIR->text();
 }
-
-bool systemUpdater::getProxyEnabled()
-{
-   return checkProxy->isChecked();
-}
-
-
-QString systemUpdater::getProxyUrl()
-{
-   return lineProxyServer->text();
-}
-
-int systemUpdater::getProxyPort()
-{
-  return spinProxyPort->value();
-}
-
 
 void systemUpdater::slotCustomTmpClicked()
@@ -502 +467 @@
         lineTMPDIR->setEnabled(false); 
         pushTMPDIR->setEnabled(false); 
-    }
-
-    slotConfigChanged();
-}
-
-void systemUpdater::slotProxyClicked()
-{
-    if ( checkProxy->isChecked() )
-    {
-        groupProxySettings->setEnabled(true);
-    } else {
-        groupProxySettings->setEnabled(false);
     }
 

pcbsd/branches/7.0/SystemUpdater/SystemUpdater.h

@@ -56 +56 @@
     void setUseCustomTmp( bool enabled );
     void setUseCustomDirName( QString tmpdir );
-    void setUseProxy( bool enabled );
-    void setUseProxySettings( QString proxyURL, int portnum );
     bool getStartupConfig();
     bool getCustomTmpEnabled();
     QString getCustomTmpDir();
-    bool getProxyEnabled();
-    QString getProxyUrl();
-    int getProxyPort();
     void slotRescanPBIUpdatesClicked();
     void slotDisableConfUpdates(bool status);
@@ -69 +64 @@
 private slots:
     void slotCustomTmpClicked();
-    void slotProxyClicked();
     void slotSelectCustomTmp();
     void slotConfigKDEProxy();

pcbsd/branches/7.0/SystemUpdater/SystemUpdater.ui

@@ -663 +663 @@
        </item>
        <item row="4" column="0" >
-        <widget class="QCheckBox" name="checkProxy" >
-         <property name="text" >
-          <string>Specify proxy for update check</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" >
-        <widget class="QGroupBox" name="groupProxySettings" >
-         <property name="title" >
-          <string>Proxy Settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" >
-           <layout class="QHBoxLayout" name="horizontalLayout_2" >
-            <item>
-             <widget class="QLabel" name="label" >
-              <property name="text" >
-               <string>Proxy Server</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="lineProxyServer" />
-            </item>
-            <item>
-             <widget class="QLabel" name="label_2" >
-              <property name="text" >
-               <string>Port</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="spinProxyPort" >
-              <property name="maximum" >
-               <number>9999</number>
-              </property>
-              <property name="value" >
-               <number>8080</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="6" column="0" >
         <layout class="QHBoxLayout" name="horizontalLayout_3" >
          <item>
@@ -727 +680 @@
           <widget class="QPushButton" name="pushConfigProxy" >
            <property name="text" >
-            <string>Configure Download Proxy</string>
+            <string>Configure Proxy Settings</string>
            </property>
           </widget>
@@ -746 +699 @@
         </layout>
        </item>
-       <item row="7" column="0" >
+       <item row="5" column="0" >
         <spacer name="spacer8" >
          <property name="orientation" >
@@ -762 +715 @@
         </spacer>
        </item>
-       <item row="8" column="0" >
+       <item row="6" column="0" >
         <spacer name="spacer9" >
          <property name="orientation" >

pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp

@@ -108 +108 @@
 QString PBIProgURL3[900];
 QString PBIProgMD5[900];
+QString PBIProgLoc[900];
 int     PBIProgUpdate[900];
 int     PBIProgFailed[900];
@@ -159 +160 @@
   username = getlogin();
 
+  // Setup our Context Menu
+  contextMenu()->insertSeparator();
+  contextMenu()->insertItem( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()), 0, 5);
+  contextMenu()->insertItem( tr("Run at startup"), this, SLOT(slotChangeRunStartup()), 0, 6);
+  contextMenu()->setItemChecked ( 6, TRUE );
+  
   // Set the tray icon that we are checking for updates
   QIcon Icon;
@@ -164 +171 @@
   setIcon(Icon);
 
-  // Setup our Context Menu
-  contextMenu()->clear();
-  //contextMenu()->insertTitle(PixmapIcon, tr("PC-BSD Update Manager"), 1);
-  contextMenu()->insertSeparator();
-  contextMenu()->insertItem( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()), 0, 5);
-  contextMenu()->insertItem( tr("Run at startup"), this, SLOT(slotChangeRunStartup()), 0, 6);
-  contextMenu()->setItemChecked ( 6, TRUE );
-  //contextMenu()->insertItem( tr("Checking for System Updates..."), this, SLOT(slotStartUpdateCheckManual(), 0, 6);
-
   // Load the program preferences
   loadUpdaterPrefs();
 
   // Start the monitor service for system updates
-  slotScheduledSystemCheck();
+  QTimer::singleShot(1000, this, SLOT(slotScheduledSystemCheck()));
 
   // Start the monitor service for PBI updates
-  slotScheduledPBICheck();
+  QTimer::singleShot(1000, this, SLOT(slotScheduledPBICheck()));
   
 }
@@ -216 +214 @@
 
 
-void UpdaterTray::slotStartUpdateCheck() {
+void UpdaterTray::slotStartUpdateCheck()
+{
+  QString SysUrl;
+  QString PatchSet;
+  QString Version;
+  QString Arch, line;
 
   // Check if the system is doing updates right now, if it is, ignore the request
@@ -244 +247 @@
   displayTooltip();
 
-  // Run the getUpdatesDir.sh script to rsync with master server
-  getUpdatesDir = new Q3Process( this );
-  getUpdatesDir->addArgument( "sh");
-  getUpdatesDir->addArgument( "/PCBSD/SystemUpdater/bin/getUpdatesDir.sh");
-  if ( useProxyServer )
-  {
-     QString proxyArgPort;
-     proxyArgPort.setNum(proxyServerPort);
-
-     QString proxyArgUrl = proxyServerUrl;
-
-     // Check if we need to remove a http://
-     if ( proxyServerUrl.indexOf("http://") == 0 )
-     {
-        proxyArgUrl.remove(0, 7);
-     }
-
-     getUpdatesDir->addArgument( proxyArgUrl + ":" + proxyArgPort );
-
-  } else {
-     getUpdatesDir->addArgument( "DISABLE" );
-  }
-
-  // Connect the exited signal and start the process
-  connect( getUpdatesDir, SIGNAL(processExited()), this, SLOT(slotSysUpdateCheckFinished() ) );
-  //connect( SetupScript, SIGNAL(readyReadStdout()), this, SLOT(readyReadScriptOutput2() ) );
-  if ( ! getUpdatesDir->start() ) {
-        QMessageBox::information( 0, tr("Error!"), tr("Error running updates1 script! "), QMessageBox::Ok );
-  }
-
-
-
+  // Run our KIO Job to fetch the system-update patch data for this version of PC-BSD
+
+  // First, get some variables to figure out the full patch URL
+  QFile file( "/PCBSD/SystemUpdater/conf/sysupdate.conf" );
+  if ( file.open( IO_ReadOnly ) ) {
+      QTextStream stream( &file );
+      while ( !stream.atEnd() ) {
+          line = stream.readLine(); // line of text excluding '\n'
+          if ( line.find("UPDATESERVER: " ) == 0)
+          {
+              line.replace("UPDATESERVER: ", "");
+              SysUrl = line; 
+          }
+          
+          if ( line.find("PATCHSET: " ) == 0)
+          {
+              line.replace("PATCHSET: ", "");
+              PatchSet = line; 
+          }
+       }
+      file.close();
+   } 
+
+   QString command = "pbreg get /PC-BSD/Version";
+   Version = getLineFromCommandOutput(command);
+
+   command = "uname -p";
+   Arch = getLineFromCommandOutput(command);
+   if ( Arch.indexOf("i386") != -1 )
+   {
+      Arch = "i386";
+   }
+   if ( Arch.indexOf("amd64") != -1 )
+   {
+      Arch = "amd64";
+   }
+
+   if ( SysUrl.isEmpty() || PatchSet.isEmpty() || Version.isEmpty() || Arch.isEmpty() )
+   {
+        // Bad patch file?
+        QMessageBox::information( 0, tr("Error!"), tr("Error parsing sysupdate.conf!!!"), QMessageBox::Ok );
+        return;
+   }
+
+  QString patchfile = "patch-" + PatchSet + "-" + Version + "-" + Arch + ".tgz";
+  sysPatchsetTmpFile = "/PCBSD/tmp/" + patchfile;
+  QString patchurl = SysUrl + "/" + patchfile;
+
+  // Start our KIO copy now
+  sysFetchJob = KIO::file_copy( patchurl, sysPatchsetTmpFile, -1, KIO::HideProgressInfo | KIO::Overwrite);
+  connect(sysFetchJob, SIGNAL(result(KJob *)), this, SLOT(slotSysUpdateCheckFinished() ) );
+  
 }
 
@@ -285 +308 @@
 
 void UpdaterTray::slotSysUpdateCheckFinished() {
-  // Check to see if the update download was successful and warn if not
-  if ( getUpdatesDir->exitStatus() != 0 )
-  {
-        QMessageBox::warning( 0, tr("Update Error!"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings under 'configure'"), QMessageBox::Ok );
-  } 
+
+  QString command = "pbreg get /PC-BSD/Version";
+  QString Version = getLineFromCommandOutput(command);
 
    // Now traverse the directory, see if we have updates.
@@ -295 +316 @@
   readSysUpdates->addArgument( "sh");
   readSysUpdates->addArgument( "/PCBSD/SystemUpdater/bin/readSysUpdates.sh");
+  readSysUpdates->addArgument( Version );
+
+  // Check to see if the update download was successful and warn if not
+  if ( sysFetchJob->error() != 0 )
+  {
+        // Check if we should show the updater dialog or not
+        if (! SystemUpdaterDialog->isShown() )
+        {
+           SystemUpdaterDialog->show();
+           QMessageBox::warning( 0, tr("Update Error!"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings under Configuration"), QMessageBox::Ok );
+           SystemUpdaterDialog->hide();
+        } else {
+           QMessageBox::warning( 0, tr("Update Error!"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings under Configuration"), QMessageBox::Ok );
+        }
+  } else {
+     // Add the patchdata URL
+     readSysUpdates->addArgument(sysPatchsetTmpFile);
+  } 
 
   // Connect the exited signal and start the process
@@ -625 +664 @@
    //QToolTip::clear();
    // Update the tooltop
-   QToolTip::remove(this->contextMenu());
-   QToolTip::add(this->contextMenu(), tooltipStr);
+   QToolTip::remove(contextMenu());
+   QToolTip::add(contextMenu(), tooltipStr);
 
 }
@@ -685 +724 @@
   settings.writeEntry( "/PC-BSD/SystemUpdater/customTmpDir", customTmpDir );
 
-  useProxyServer = SystemUpdaterDialog->getProxyEnabled();
-  settings.setValue( "/PC-BSD/SystemUpdater/useProxyServer", useProxyServer );
- 
-  proxyServerUrl = SystemUpdaterDialog->getProxyUrl();
-  settings.setValue( "/PC-BSD/SystemUpdater/proxyServerUrl", proxyServerUrl );
-
-  proxyServerPort = SystemUpdaterDialog->getProxyPort();
-  settings.setValue( "/PC-BSD/SystemUpdater/proxyServerPort", proxyServerPort );
-
-
 }
 
 void UpdaterTray::loadUpdaterPrefs() {
   // Load the user preferences for the System Updater
-  bool ok;
   QSettings settings;
   
@@ -726 +754 @@
   SystemUpdaterDialog->setUseCustomDirName( customTmpDir );
   
-  // Load if the user wants to use a proxy server
-  useProxyServer = settings.readBoolEntry( "/PC-BSD/SystemUpdater/useProxyServer", false );
-  SystemUpdaterDialog->setUseProxy( useProxyServer );
-  
-  // Load Proxy Server Settings
-  proxyServerUrl = settings.value( "/PC-BSD/SystemUpdater/proxyServerUrl" ).toString();
-
-  settings.value("/PC-BSD/SystemUpdater/proxyServerPort").toInt(&ok);
-  if ( ok ) {
-     proxyServerPort = settings.value( "/PC-BSD/SystemUpdater/proxyServerPort").toInt(&ok);
-  } else {
-     proxyServerPort = 8080;
-  }
-  SystemUpdaterDialog->setUseProxySettings( proxyServerUrl, proxyServerPort );
-
   SystemUpdaterDialog->slotDisableConfUpdates(false);
 
@@ -1145 +1158 @@
 
 
-    copyJob = KIO::copy(SysUpdateURL[currentSysWorkingItem], patchTmpDir + "/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma", KIO::HideProgressInfo);
+    copyJob = KIO::file_copy(SysUpdateURL[currentSysWorkingItem], patchTmpDir + "/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma", -1, KIO::HideProgressInfo | KIO::Overwrite);
     
     connect(copyJob, SIGNAL(totalSize(KJob*, qulonglong)), UpdaterStatusDialog, SLOT(slotJobUpdateTotalSize( KJob*, qulonglong)));
@@ -1617 +1630 @@
 void UpdaterTray::slotPBICheckUpdate()
 {
-   
-
+
+    QString tmp, line;
+    QString progName, Arch, Version, PBIUrl;
+
+
+    // Jump to the next PBI in our list
     currentWorkingPBI++;
-    QString tmp;
-    QString progName;
-
-
+
+    // Check if we are done with checking for updates
     if ( PBIProgName[currentWorkingPBI].isEmpty() )
     {
@@ -1644 +1659 @@
 
 
-  checkPBIProc = new Q3Process( this );
-  checkPBIProc->addArgument( "/PCBSD/SystemUpdater/bin/getPBIUpdateStatus.sh" );
-  checkPBIProc->addArgument( progName );
-  checkPBIProc->addArgument( PBIProgVer[currentWorkingPBI]  );
-
-  if ( useProxyServer )
-  {
-     QString proxyArgPort;
-     proxyArgPort.setNum(proxyServerPort);
-    
-     QString proxyArgUrl = proxyServerUrl;
-
-     // Check if we need to remove a http://
-     if ( proxyServerUrl.indexOf("http://") == 0 )
-     {
-        proxyArgUrl.remove(0, 7);
-     }
-
-     checkPBIProc->addArgument( proxyArgUrl + ":" + proxyArgPort );
-
-  } else {
-     checkPBIProc->addArgument( "DISABLE" );
-  }
-
-
-  connect( checkPBIProc, SIGNAL(readyReadStdout()), this, SLOT(slotReadPBIStatusResults() ) );
-  connect( checkPBIProc, SIGNAL(processExited()), this, SLOT(slotPBICheckUpdate() ) );
-  if ( !checkPBIProc->start() ) {
-
-  }
-
-
-}
-
+
+  // First, get some variables to figure out the full patch URL
+  QFile file( "/Programs/" + progName + PBIProgVer[currentWorkingPBI] + "/PBI.UpdateURL.sh" );
+  if ( file.open( IO_ReadOnly ) ) {
+      QTextStream stream( &file );
+      while ( !stream.atEnd() ) {
+          line = stream.readLine(); // line of text excluding '\n'
+          if ( line.find("PBIUpdateURL=\"" ) == 0)
+          {
+              line.replace("PBIUpdateURL=\"", "");
+              line.truncate(line.indexOf("\""));
+              PBIUrl = line;
+              //QMessageBox::critical( 0, tr("Online Update"), PBIUrl, QMessageBox::Ok );
+          }
+
+       }
+      file.close();
+   } 
+
+   if ( PBIUrl.isEmpty() )
+   {
+     // No PBI update file for this program, jump to next program
+     QTimer::singleShot(1000, this, SLOT(slotPBICheckUpdate() ) );
+     return;
+   }
+
+
+   QString command = "pbreg get /PC-BSD/Version";
+   Version = getLineFromCommandOutput(command);
+
+   command = "uname -p";
+   Arch = getLineFromCommandOutput(command);
+   if ( Arch.indexOf("i386") != -1 )
+   {
+      Arch = "i386";
+   }
+   if ( Arch.indexOf("amd64") != -1 )
+   {
+      Arch = "amd64";
+   }
+
+  QString postData = "PBIName=" + progName + "&PBIVer=" + PBIProgVer[currentWorkingPBI] + "&PCBSDVER=" + Version + "&OSARCH=" + Arch;
+  
+  checkPBIJob = KIO::http_post( PBIUrl, postData.utf8(), KIO::HideProgressInfo);
+  checkPBIJob->addMetaData("content-type", "Content-type: application/x-www-form-urlencoded" );
+
+
+  connect(checkPBIJob, SIGNAL(result(KJob *)), this, SLOT(slotPBICheckUpdate() ) );
+  connect(checkPBIJob, SIGNAL(data(KIO::Job *, const QByteArray&)), this, SLOT(slotRecieveData(KIO::Job *, const QByteArray& ) ) );
+
+}
+
+void UpdaterTray::slotRecieveData(KIO::Job*, const QByteArray& data)
+{
+    QString output(data), line;
+    QStringList outputList;
+    if ( output.indexOf("Up2Date") == -1  && ! output.isEmpty())
+    {
+        outputList = QStringList::split("\n", output);
+        for ( int i = 0; i < outputList.size(); i++)
+        {
+            line = outputList.at(i);
+           
+             if (line.find("NewVer:" ) ==  0 )
+             {
+               PBIProgNewVer[currentWorkingPBI] = line.replace("NewVer: ", "");
+             }
+             if ( line.find("Mirror1:") == 0)
+             {
+              PBIProgURL1[currentWorkingPBI] = line.replace("Mirror1: ", "");
+             }
+             // Check for our other file locations
+             if ( line.find("Mirror2:") == 0)
+             {
+               PBIProgURL2[currentWorkingPBI] = line.replace("Mirror2: ", "");
+             }
+             if ( line.find("Mirror3:") == 0)
+             {
+                 PBIProgURL3[currentWorkingPBI] = line.replace("Mirror3: ", "");
+             }
+             if ( line.find("FileLoc:") == 0)
+             {
+                 PBIProgLoc[currentWorkingPBI] = line.replace("FileLoc: ", "");
+             }
+             if ( line.find("MD5:") == 0)
+             {
+                 PBIProgMD5[currentWorkingPBI] = line.replace("MD5: ", "");
+             } 
+        } // End of For loop reading line-by-line our data
+
+        // Check to ensure we have found all our variables
+        if ( ! PBIProgNewVer[currentWorkingPBI].isEmpty() && ! PBIProgURL1[currentWorkingPBI].isEmpty() && ! PBIProgURL2[currentWorkingPBI].isEmpty() && ! PBIProgURL3[currentWorkingPBI].isEmpty() && ! PBIProgLoc[currentWorkingPBI].isEmpty() && ! PBIProgMD5[currentWorkingPBI].isEmpty() )
+        {
+              // We have valid data! Set the flag that this PBI is in need of an update
+              PBIProgUpdate[currentWorkingPBI] = 1;
+        }
+    } // End of IF statement to find if this string has update data
+}
 
 
@@ -1963 +2042 @@
        URL = PBIProgURL1[currentWorkingPBI];
    }
+
+   // Append the PBI location to our mirror URL now
+   URL = URL + PBIProgLoc[currentWorkingPBI];
    
    id.setNum(currentWorkingPBI);
@@ -1984 +2066 @@
     }
 
-    copyJob = KIO::copy(URL, patchTmpDir + "/" + tmp.setNum(currentWorkingPBI) + ".pbi", KIO::HideProgressInfo);
+    copyJob = KIO::file_copy(URL, patchTmpDir + "/" + tmp.setNum(currentWorkingPBI) + ".pbi", -1, KIO::HideProgressInfo | KIO::Overwrite);
     
     connect(copyJob, SIGNAL(totalSize(KJob*, qulonglong)), UpdaterStatusDialog, SLOT(slotJobUpdateTotalSize( KJob*, qulonglong)));
@@ -2233 +2315 @@
    command = "su " + username + " -c 'kcmshell4 proxy' &";
    system(command); 
-}
+   QMessageBox::information( 0, tr("Proxy Configuration!"), tr("You will need to restart the system updater for any proxy changes to take effect!"), QMessageBox::Ok );
+}

pcbsd/branches/7.0/SystemUpdater/UpdaterTray.h

@@ -2 +2 @@
 #include <qpair.h>
 #include <qstring.h>
-
 #include <ksystemtrayicon.h>
 #include <kio/jobclasses.h>
@@ -55 +54 @@
    void slotTrayActivated(QSystemTrayIcon::ActivationReason reason);
    void slotLaunchKDEProxyConfig();
+   void slotRecieveData(KIO::Job*, const QByteArray& data);
    
 protected:
@@ -64 +64 @@
    void loadPatchData(QString patchFile, int patchNum);
    KJob *copyJob;
+   KJob *sysFetchJob;
+   KIO::TransferJob *checkPBIJob;
+   QString sysPatchsetTmpFile;
    bool useCustomTmpDir;
    QString customTmpDir;
-   bool useProxyServer;
-   QString proxyServerUrl;
-   int proxyServerPort;
    QString patchTmpDir;
 };

pcbsd/trunk/SystemUpdater/SystemUpdater.cpp

@@ -45 +45 @@
     // Connect the Custom Tmpdir Checkbox
     connect( checkTMPDIR, SIGNAL( clicked() ), this, SLOT( slotCustomTmpClicked() ) );
-    connect( checkProxy, SIGNAL( clicked() ), this, SLOT( slotProxyClicked() ) );
     connect( pushTMPDIR, SIGNAL( clicked() ), this, SLOT( slotSelectCustomTmp() ) );
     connect( pushConfigProxy, SIGNAL( clicked() ), this, SLOT( slotConfigKDEProxy() ) );
@@ -51 +50 @@
     // Connect slots to emit signal when settings change
     connect( lineTMPDIR, SIGNAL( textChanged(const QString &) ), this, SLOT( slotConfigChanged() ) );
-    connect( lineProxyServer, SIGNAL( textChanged(const QString &) ), this, SLOT( slotConfigChanged() ) );
-    connect( spinProxyPort, SIGNAL( valueChanged(const QString &) ), this, SLOT( slotConfigChanged() ) );
     
 }
@@ -450 +447 @@
 }
 
-// Set Proxy Usage
-void systemUpdater::setUseProxy( bool enabled )
-{
-    checkProxy->setChecked(enabled);
-    groupProxySettings->setEnabled(enabled);
-}
-
-// Set the Proxy being used
-void systemUpdater::setUseProxySettings( QString proxyURL, int portnum )
-{
-    lineProxyServer->setText(proxyURL);
-    spinProxyPort->setValue(portnum);
-}
-
-
 bool systemUpdater::getCustomTmpEnabled()
 {
@@ -475 +457 @@
    return lineTMPDIR->text();
 }
-
-bool systemUpdater::getProxyEnabled()
-{
-   return checkProxy->isChecked();
-}
-
-
-QString systemUpdater::getProxyUrl()
-{
-   return lineProxyServer->text();
-}
-
-int systemUpdater::getProxyPort()
-{
-  return spinProxyPort->value();
-}
-
 
 void systemUpdater::slotCustomTmpClicked()
@@ -502 +467 @@
         lineTMPDIR->setEnabled(false); 
         pushTMPDIR->setEnabled(false); 
-    }
-
-    slotConfigChanged();
-}
-
-void systemUpdater::slotProxyClicked()
-{
-    if ( checkProxy->isChecked() )
-    {
-        groupProxySettings->setEnabled(true);
-    } else {
-        groupProxySettings->setEnabled(false);
     }
 

pcbsd/trunk/SystemUpdater/SystemUpdater.h

@@ -56 +56 @@
     void setUseCustomTmp( bool enabled );
     void setUseCustomDirName( QString tmpdir );
-    void setUseProxy( bool enabled );
-    void setUseProxySettings( QString proxyURL, int portnum );
     bool getStartupConfig();
     bool getCustomTmpEnabled();
     QString getCustomTmpDir();
-    bool getProxyEnabled();
-    QString getProxyUrl();
-    int getProxyPort();
     void slotRescanPBIUpdatesClicked();
     void slotDisableConfUpdates(bool status);
@@ -69 +64 @@
 private slots:
     void slotCustomTmpClicked();
-    void slotProxyClicked();
     void slotSelectCustomTmp();
     void slotConfigKDEProxy();

pcbsd/trunk/SystemUpdater/SystemUpdater.ui

@@ -663 +663 @@
        </item>
        <item row="4" column="0" >
-        <widget class="QCheckBox" name="checkProxy" >
-         <property name="text" >
-          <string>Specify proxy for update check</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" >
-        <widget class="QGroupBox" name="groupProxySettings" >
-         <property name="title" >
-          <string>Proxy Settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" >
-           <layout class="QHBoxLayout" name="horizontalLayout_2" >
-            <item>
-             <widget class="QLabel" name="label" >
-              <property name="text" >
-               <string>Proxy Server</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="lineProxyServer" />
-            </item>
-            <item>
-             <widget class="QLabel" name="label_2" >
-              <property name="text" >
-               <string>Port</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="spinProxyPort" >
-              <property name="maximum" >
-               <number>9999</number>
-              </property>
-              <property name="value" >
-               <number>8080</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="6" column="0" >
         <layout class="QHBoxLayout" name="horizontalLayout_3" >
          <item>
@@ -727 +680 @@
           <widget class="QPushButton" name="pushConfigProxy" >
            <property name="text" >
-            <string>Configure Download Proxy</string>
+            <string>Configure Proxy Settings</string>
            </property>
           </widget>
@@ -746 +699 @@
         </layout>
        </item>
-       <item row="7" column="0" >
+       <item row="5" column="0" >
         <spacer name="spacer8" >
          <property name="orientation" >
@@ -762 +715 @@
         </spacer>
        </item>
-       <item row="8" column="0" >
+       <item row="6" column="0" >
         <spacer name="spacer9" >
          <property name="orientation" >

pcbsd/trunk/SystemUpdater/UpdaterTray.cpp

@@ -108 +108 @@
 QString PBIProgURL3[900];
 QString PBIProgMD5[900];
+QString PBIProgLoc[900];
 int     PBIProgUpdate[900];
 int     PBIProgFailed[900];
@@ -159 +160 @@
   username = getlogin();
 
+  // Setup our Context Menu
+  contextMenu()->insertSeparator();
+  contextMenu()->insertItem( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()), 0, 5);
+  contextMenu()->insertItem( tr("Run at startup"), this, SLOT(slotChangeRunStartup()), 0, 6);
+  contextMenu()->setItemChecked ( 6, TRUE );
+  
   // Set the tray icon that we are checking for updates
   QIcon Icon;
@@ -164 +171 @@
   setIcon(Icon);
 
-  // Setup our Context Menu
-  contextMenu()->clear();
-  //contextMenu()->insertTitle(PixmapIcon, tr("PC-BSD Update Manager"), 1);
-  contextMenu()->insertSeparator();
-  contextMenu()->insertItem( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()), 0, 5);
-  contextMenu()->insertItem( tr("Run at startup"), this, SLOT(slotChangeRunStartup()), 0, 6);
-  contextMenu()->setItemChecked ( 6, TRUE );
-  //contextMenu()->insertItem( tr("Checking for System Updates..."), this, SLOT(slotStartUpdateCheckManual(), 0, 6);
-
   // Load the program preferences
   loadUpdaterPrefs();
 
   // Start the monitor service for system updates
-  slotScheduledSystemCheck();
+  QTimer::singleShot(1000, this, SLOT(slotScheduledSystemCheck()));
 
   // Start the monitor service for PBI updates
-  slotScheduledPBICheck();
+  QTimer::singleShot(1000, this, SLOT(slotScheduledPBICheck()));
   
 }
@@ -216 +214 @@
 
 
-void UpdaterTray::slotStartUpdateCheck() {
+void UpdaterTray::slotStartUpdateCheck()
+{
+  QString SysUrl;
+  QString PatchSet;
+  QString Version;
+  QString Arch, line;
 
   // Check if the system is doing updates right now, if it is, ignore the request
@@ -244 +247 @@
   displayTooltip();
 
-  // Run the getUpdatesDir.sh script to rsync with master server
-  getUpdatesDir = new Q3Process( this );
-  getUpdatesDir->addArgument( "sh");
-  getUpdatesDir->addArgument( "/PCBSD/SystemUpdater/bin/getUpdatesDir.sh");
-  if ( useProxyServer )
-  {
-     QString proxyArgPort;
-     proxyArgPort.setNum(proxyServerPort);
-
-     QString proxyArgUrl = proxyServerUrl;
-
-     // Check if we need to remove a http://
-     if ( proxyServerUrl.indexOf("http://") == 0 )
-     {
-        proxyArgUrl.remove(0, 7);
-     }
-
-     getUpdatesDir->addArgument( proxyArgUrl + ":" + proxyArgPort );
-
-  } else {
-     getUpdatesDir->addArgument( "DISABLE" );
-  }
-
-  // Connect the exited signal and start the process
-  connect( getUpdatesDir, SIGNAL(processExited()), this, SLOT(slotSysUpdateCheckFinished() ) );
-  //connect( SetupScript, SIGNAL(readyReadStdout()), this, SLOT(readyReadScriptOutput2() ) );
-  if ( ! getUpdatesDir->start() ) {
-        QMessageBox::information( 0, tr("Error!"), tr("Error running updates1 script! "), QMessageBox::Ok );
-  }
-
-
-
+  // Run our KIO Job to fetch the system-update patch data for this version of PC-BSD
+
+  // First, get some variables to figure out the full patch URL
+  QFile file( "/PCBSD/SystemUpdater/conf/sysupdate.conf" );
+  if ( file.open( IO_ReadOnly ) ) {
+      QTextStream stream( &file );
+      while ( !stream.atEnd() ) {
+          line = stream.readLine(); // line of text excluding '\n'
+          if ( line.find("UPDATESERVER: " ) == 0)
+          {
+              line.replace("UPDATESERVER: ", "");
+              SysUrl = line; 
+          }
+          
+          if ( line.find("PATCHSET: " ) == 0)
+          {
+              line.replace("PATCHSET: ", "");
+              PatchSet = line; 
+          }
+       }
+      file.close();
+   } 
+
+   QString command = "pbreg get /PC-BSD/Version";
+   Version = getLineFromCommandOutput(command);
+
+   command = "uname -p";
+   Arch = getLineFromCommandOutput(command);
+   if ( Arch.indexOf("i386") != -1 )
+   {
+      Arch = "i386";
+   }
+   if ( Arch.indexOf("amd64") != -1 )
+   {
+      Arch = "amd64";
+   }
+
+   if ( SysUrl.isEmpty() || PatchSet.isEmpty() || Version.isEmpty() || Arch.isEmpty() )
+   {
+        // Bad patch file?
+        QMessageBox::information( 0, tr("Error!"), tr("Error parsing sysupdate.conf!!!"), QMessageBox::Ok );
+        return;
+   }
+
+  QString patchfile = "patch-" + PatchSet + "-" + Version + "-" + Arch + ".tgz";
+  sysPatchsetTmpFile = "/PCBSD/tmp/" + patchfile;
+  QString patchurl = SysUrl + "/" + patchfile;
+
+  // Start our KIO copy now
+  sysFetchJob = KIO::file_copy( patchurl, sysPatchsetTmpFile, -1, KIO::HideProgressInfo | KIO::Overwrite);
+  connect(sysFetchJob, SIGNAL(result(KJob *)), this, SLOT(slotSysUpdateCheckFinished() ) );
+  
 }
 
@@ -285 +308 @@
 
 void UpdaterTray::slotSysUpdateCheckFinished() {
-  // Check to see if the update download was successful and warn if not
-  if ( getUpdatesDir->exitStatus() != 0 )
-  {
-        QMessageBox::warning( 0, tr("Update Error!"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings under 'configure'"), QMessageBox::Ok );
-  } 
+
+  QString command = "pbreg get /PC-BSD/Version";
+  QString Version = getLineFromCommandOutput(command);
 
    // Now traverse the directory, see if we have updates.
@@ -295 +316 @@
   readSysUpdates->addArgument( "sh");
   readSysUpdates->addArgument( "/PCBSD/SystemUpdater/bin/readSysUpdates.sh");
+  readSysUpdates->addArgument( Version );
+
+  // Check to see if the update download was successful and warn if not
+  if ( sysFetchJob->error() != 0 )
+  {
+        // Check if we should show the updater dialog or not
+        if (! SystemUpdaterDialog->isShown() )
+        {
+           SystemUpdaterDialog->show();
+           QMessageBox::warning( 0, tr("Update Error!"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings under Configuration"), QMessageBox::Ok );
+           SystemUpdaterDialog->hide();
+        } else {
+           QMessageBox::warning( 0, tr("Update Error!"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings under Configuration"), QMessageBox::Ok );
+        }
+  } else {
+     // Add the patchdata URL
+     readSysUpdates->addArgument(sysPatchsetTmpFile);
+  } 
 
   // Connect the exited signal and start the process
@@ -625 +664 @@
    //QToolTip::clear();
    // Update the tooltop
-   QToolTip::remove(this->contextMenu());
-   QToolTip::add(this->contextMenu(), tooltipStr);
+   QToolTip::remove(contextMenu());
+   QToolTip::add(contextMenu(), tooltipStr);
 
 }
@@ -685 +724 @@
   settings.writeEntry( "/PC-BSD/SystemUpdater/customTmpDir", customTmpDir );
 
-  useProxyServer = SystemUpdaterDialog->getProxyEnabled();
-  settings.setValue( "/PC-BSD/SystemUpdater/useProxyServer", useProxyServer );
- 
-  proxyServerUrl = SystemUpdaterDialog->getProxyUrl();
-  settings.setValue( "/PC-BSD/SystemUpdater/proxyServerUrl", proxyServerUrl );
-
-  proxyServerPort = SystemUpdaterDialog->getProxyPort();
-  settings.setValue( "/PC-BSD/SystemUpdater/proxyServerPort", proxyServerPort );
-
-
 }
 
 void UpdaterTray::loadUpdaterPrefs() {
   // Load the user preferences for the System Updater
-  bool ok;
   QSettings settings;
   
@@ -726 +754 @@
   SystemUpdaterDialog->setUseCustomDirName( customTmpDir );
   
-  // Load if the user wants to use a proxy server
-  useProxyServer = settings.readBoolEntry( "/PC-BSD/SystemUpdater/useProxyServer", false );
-  SystemUpdaterDialog->setUseProxy( useProxyServer );
-  
-  // Load Proxy Server Settings
-  proxyServerUrl = settings.value( "/PC-BSD/SystemUpdater/proxyServerUrl" ).toString();
-
-  settings.value("/PC-BSD/SystemUpdater/proxyServerPort").toInt(&ok);
-  if ( ok ) {
-     proxyServerPort = settings.value( "/PC-BSD/SystemUpdater/proxyServerPort").toInt(&ok);
-  } else {
-     proxyServerPort = 8080;
-  }
-  SystemUpdaterDialog->setUseProxySettings( proxyServerUrl, proxyServerPort );
-
   SystemUpdaterDialog->slotDisableConfUpdates(false);
 
@@ -1145 +1158 @@
 
 
-    copyJob = KIO::copy(SysUpdateURL[currentSysWorkingItem], patchTmpDir + "/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma", KIO::HideProgressInfo);
+    copyJob = KIO::file_copy(SysUpdateURL[currentSysWorkingItem], patchTmpDir + "/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma", -1, KIO::HideProgressInfo | KIO::Overwrite);
     
     connect(copyJob, SIGNAL(totalSize(KJob*, qulonglong)), UpdaterStatusDialog, SLOT(slotJobUpdateTotalSize( KJob*, qulonglong)));
@@ -1617 +1630 @@
 void UpdaterTray::slotPBICheckUpdate()
 {
-   
-
+
+    QString tmp, line;
+    QString progName, Arch, Version, PBIUrl;
+
+
+    // Jump to the next PBI in our list
     currentWorkingPBI++;
-    QString tmp;
-    QString progName;
-
-
+
+    // Check if we are done with checking for updates
     if ( PBIProgName[currentWorkingPBI].isEmpty() )
     {
@@ -1644 +1659 @@
 
 
-  checkPBIProc = new Q3Process( this );
-  checkPBIProc->addArgument( "/PCBSD/SystemUpdater/bin/getPBIUpdateStatus.sh" );
-  checkPBIProc->addArgument( progName );
-  checkPBIProc->addArgument( PBIProgVer[currentWorkingPBI]  );
-
-  if ( useProxyServer )
-  {
-     QString proxyArgPort;
-     proxyArgPort.setNum(proxyServerPort);
-    
-     QString proxyArgUrl = proxyServerUrl;
-
-     // Check if we need to remove a http://
-     if ( proxyServerUrl.indexOf("http://") == 0 )
-     {
-        proxyArgUrl.remove(0, 7);
-     }
-
-     checkPBIProc->addArgument( proxyArgUrl + ":" + proxyArgPort );
-
-  } else {
-     checkPBIProc->addArgument( "DISABLE" );
-  }
-
-
-  connect( checkPBIProc, SIGNAL(readyReadStdout()), this, SLOT(slotReadPBIStatusResults() ) );
-  connect( checkPBIProc, SIGNAL(processExited()), this, SLOT(slotPBICheckUpdate() ) );
-  if ( !checkPBIProc->start() ) {
-
-  }
-
-
-}
-
+
+  // First, get some variables to figure out the full patch URL
+  QFile file( "/Programs/" + progName + PBIProgVer[currentWorkingPBI] + "/PBI.UpdateURL.sh" );
+  if ( file.open( IO_ReadOnly ) ) {
+      QTextStream stream( &file );
+      while ( !stream.atEnd() ) {
+          line = stream.readLine(); // line of text excluding '\n'
+          if ( line.find("PBIUpdateURL=\"" ) == 0)
+          {
+              line.replace("PBIUpdateURL=\"", "");
+              line.truncate(line.indexOf("\""));
+              PBIUrl = line;
+              //QMessageBox::critical( 0, tr("Online Update"), PBIUrl, QMessageBox::Ok );
+          }
+
+       }
+      file.close();
+   } 
+
+   if ( PBIUrl.isEmpty() )
+   {
+     // No PBI update file for this program, jump to next program
+     QTimer::singleShot(1000, this, SLOT(slotPBICheckUpdate() ) );
+     return;
+   }
+
+
+   QString command = "pbreg get /PC-BSD/Version";
+   Version = getLineFromCommandOutput(command);
+
+   command = "uname -p";
+   Arch = getLineFromCommandOutput(command);
+   if ( Arch.indexOf("i386") != -1 )
+   {
+      Arch = "i386";
+   }
+   if ( Arch.indexOf("amd64") != -1 )
+   {
+      Arch = "amd64";
+   }
+
+  QString postData = "PBIName=" + progName + "&PBIVer=" + PBIProgVer[currentWorkingPBI] + "&PCBSDVER=" + Version + "&OSARCH=" + Arch;
+  
+  checkPBIJob = KIO::http_post( PBIUrl, postData.utf8(), KIO::HideProgressInfo);
+  checkPBIJob->addMetaData("content-type", "Content-type: application/x-www-form-urlencoded" );
+
+
+  connect(checkPBIJob, SIGNAL(result(KJob *)), this, SLOT(slotPBICheckUpdate() ) );
+  connect(checkPBIJob, SIGNAL(data(KIO::Job *, const QByteArray&)), this, SLOT(slotRecieveData(KIO::Job *, const QByteArray& ) ) );
+
+}
+
+void UpdaterTray::slotRecieveData(KIO::Job*, const QByteArray& data)
+{
+    QString output(data), line;
+    QStringList outputList;
+    if ( output.indexOf("Up2Date") == -1  && ! output.isEmpty())
+    {
+        outputList = QStringList::split("\n", output);
+        for ( int i = 0; i < outputList.size(); i++)
+        {
+            line = outputList.at(i);
+           
+             if (line.find("NewVer:" ) ==  0 )
+             {
+               PBIProgNewVer[currentWorkingPBI] = line.replace("NewVer: ", "");
+             }
+             if ( line.find("Mirror1:") == 0)
+             {
+              PBIProgURL1[currentWorkingPBI] = line.replace("Mirror1: ", "");
+             }
+             // Check for our other file locations
+             if ( line.find("Mirror2:") == 0)
+             {
+               PBIProgURL2[currentWorkingPBI] = line.replace("Mirror2: ", "");
+             }
+             if ( line.find("Mirror3:") == 0)
+             {
+                 PBIProgURL3[currentWorkingPBI] = line.replace("Mirror3: ", "");
+             }
+             if ( line.find("FileLoc:") == 0)
+             {
+                 PBIProgLoc[currentWorkingPBI] = line.replace("FileLoc: ", "");
+             }
+             if ( line.find("MD5:") == 0)
+             {
+                 PBIProgMD5[currentWorkingPBI] = line.replace("MD5: ", "");
+             } 
+        } // End of For loop reading line-by-line our data
+
+        // Check to ensure we have found all our variables
+        if ( ! PBIProgNewVer[currentWorkingPBI].isEmpty() && ! PBIProgURL1[currentWorkingPBI].isEmpty() && ! PBIProgURL2[currentWorkingPBI].isEmpty() && ! PBIProgURL3[currentWorkingPBI].isEmpty() && ! PBIProgLoc[currentWorkingPBI].isEmpty() && ! PBIProgMD5[currentWorkingPBI].isEmpty() )
+        {
+              // We have valid data! Set the flag that this PBI is in need of an update
+              PBIProgUpdate[currentWorkingPBI] = 1;
+        }
+    } // End of IF statement to find if this string has update data
+}
 
 
@@ -1963 +2042 @@
        URL = PBIProgURL1[currentWorkingPBI];
    }
+
+   // Append the PBI location to our mirror URL now
+   URL = URL + PBIProgLoc[currentWorkingPBI];
    
    id.setNum(currentWorkingPBI);
@@ -1984 +2066 @@
     }
 
-    copyJob = KIO::copy(URL, patchTmpDir + "/" + tmp.setNum(currentWorkingPBI) + ".pbi", KIO::HideProgressInfo);
+    copyJob = KIO::file_copy(URL, patchTmpDir + "/" + tmp.setNum(currentWorkingPBI) + ".pbi", -1, KIO::HideProgressInfo | KIO::Overwrite);
     
     connect(copyJob, SIGNAL(totalSize(KJob*, qulonglong)), UpdaterStatusDialog, SLOT(slotJobUpdateTotalSize( KJob*, qulonglong)));
@@ -2233 +2315 @@
    command = "su " + username + " -c 'kcmshell4 proxy' &";
    system(command); 
-}
+   QMessageBox::information( 0, tr("Proxy Configuration!"), tr("You will need to restart the system updater for any proxy changes to take effect!"), QMessageBox::Ok );
+}

pcbsd/trunk/SystemUpdater/UpdaterTray.h

@@ -2 +2 @@
 #include <qpair.h>
 #include <qstring.h>
-
 #include <ksystemtrayicon.h>
 #include <kio/jobclasses.h>
@@ -55 +54 @@
    void slotTrayActivated(QSystemTrayIcon::ActivationReason reason);
    void slotLaunchKDEProxyConfig();
+   void slotRecieveData(KIO::Job*, const QByteArray& data);
    
 protected:
@@ -64 +64 @@
    void loadPatchData(QString patchFile, int patchNum);
    KJob *copyJob;
+   KJob *sysFetchJob;
+   KIO::TransferJob *checkPBIJob;
+   QString sysPatchsetTmpFile;
    bool useCustomTmpDir;
    QString customTmpDir;
-   bool useProxyServer;
-   QString proxyServerUrl;
-   int proxyServerPort;
    QString patchTmpDir;
 };