Use OProcess instead of popen/pclose and re-read config upon data re-fresh

2 files changed, 39 insertions, 34 deletions

diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 0fd8e57..6444ebf 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -24,40 +24,26 @@
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
-#include <stdio.h>
 
 #include <qfile.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qtextstream.h>
 
+#include <opie/oprocess.h>
+
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include "weatherpluginwidget.h"
 
 WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
         : QWidget( parent,  name )
 {
-        Config config( "todayweatherplugin");
-        config.setGroup( "Config" );
-
-        location = config.readEntry( "Location", "" );
-        useMetric = config.readBoolEntry( "Metric", TRUE );
-        frequency = config.readNumEntry( "Frequency", 5 );
-
-        localFile = "/tmp/";
-        localFile.append( location );
-        localFile.append( ".TXT" );
-
-        remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/";
-        remoteFile.append( location );
-        remoteFile.append( ".TXT" );
-
         QHBoxLayout *layout = new QHBoxLayout( this );
         layout->setAutoAdd( TRUE );
         layout->setSpacing( 2 );
 
@@ -71,9 +57,8 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
         weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
         weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
 
         startTimer(1000);
-        //retreiveData();
 }
 
 WeatherPluginWidget::~WeatherPluginWidget()
 {
@@ -95,28 +80,34 @@ void WeatherPluginWidget::timerEvent( QTimerEvent *e )
 void WeatherPluginWidget::retreiveData()
 {
         startTimer( frequency * 60000 );
 
+        Config config( "todayweatherplugin");
+        config.setGroup( "Config" );
+
+        location = config.readEntry( "Location", "" );
+        useMetric = config.readBoolEntry( "Metric", TRUE );
+        frequency = config.readNumEntry( "Frequency", 5 );
+
+        localFile = "/tmp/";
+        localFile.append( location );
+        localFile.append( ".TXT" );
+
+        remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/";
+        remoteFile.append( location );
+        remoteFile.append( ".TXT" );
+
         QFile file( localFile );
         if ( file.exists() )
         {
                 file.remove();
         }
 
-        QString command = "wget -q ";
-        command.append( remoteFile );
-        command.append( " -O " );
-        command.append( localFile );
-        FILE *get = popen( command.latin1(), "r" );
-        if ( get )
-        {
-                pclose( get );
-                displayWeather();
-        }
-        else
-        {
-                weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
-        }
+        OProcess *proc = new OProcess;
+
+        *proc << "wget" << "-q" << remoteFile << "-O" << localFile;
+        connect( proc, SIGNAL( processExited( OProcess * ) ), this, SLOT( dataRetrieved( OProcess * ) ) );
+        proc->start();
 }
 
 void WeatherPluginWidget::displayWeather()
 {
@@ -318,4 +309,16 @@ void WeatherPluginWidget::getIcon(const QString &data )
         {
                 dataStr = "sleet";
         }
 }
+
+void WeatherPluginWidget::dataRetrieved( OProcess *process )
+{
+        if ( process->normalExit() )
+        {
+                displayWeather();
+        }
+        else
+        {
+                weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+        }
+}
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.h b/noncore/todayplugins/weather/weatherpluginwidget.h
index 2c0238d..d2bbd8b 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.h
+++ b/noncore/todayplugins/weather/weatherpluginwidget.h
@@ -31,10 +31,9 @@
 
 #include <qstring.h>
 #include <qwidget.h>
 
-#include <unistd.h>
-
+class OProcess;
 class QLabel;
 class QTimer;
 
 class WeatherPluginWidget : public QWidget {
@@ -55,15 +54,18 @@ class WeatherPluginWidget : public QWidget {
                 int     frequency;
 
                 QLabel *weatherLabel;
                 QLabel *weatherIcon;
-                
+
                 void timerEvent( QTimerEvent * );
                 void retreiveData();
                 void displayWeather();
                 void getTemp( const QString & );
                 void getWind( const QString & );
                 void getPressure( const QString & );
                 void getIcon( const QString & );
+
+        private slots:
+                void dataRetrieved( OProcess * );
 };
 
 #endif