Hi Please cleanup The code. Also use the regular event loop to make a non
blocking call to the service.
 Le 19 juil. 2014 15:58, "Alexander Wolf" <email address hidden> a écrit :

> Alexander Wolf has proposed merging
> lp:~georg-zotti/stellarium/ip-query-location into lp:stellarium.
>
> Requested reviews:
>   Alexander Wolf (alexwolf)
>
> For more details, see:
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
>
> This branch introduces new feature - automatic finding approximate
> location of Stellarium from IP address.
> --
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are subscribed to branch lp:stellarium.
>
> === modified file 'src/core/StelCore.cpp'
> --- src/core/StelCore.cpp       2014-04-14 17:55:46 +0000
> +++ src/core/StelCore.cpp       2014-07-19 07:57:49 +0000
> @@ -114,7 +114,14 @@
>         defaultLocationID =
> conf->value("init_location/location","error").toString();
>         bool ok;
>         StelLocationMgr* locationMgr =
> &StelApp::getInstance().getLocationMgr();
> -       StelLocation location =
> locationMgr->locationForString(defaultLocationID);
> +       StelLocation location;
> +       if (conf->value("init_location/use_ip_geolocation_if_available",
> "false").toBool()
> +                       && locationMgr->ipConnectionExists())
> +       {
> +               location=locationMgr->locationFromIP();
> +       }
> +
> +       else location = locationMgr->locationForString(defaultLocationID);
>         if (!location.isValid())
>         {
>                 qWarning() << "Warning: location" << defaultLocationID <<
> "is unknown.";
>
> === modified file 'src/core/StelLocationMgr.cpp'
> --- src/core/StelLocationMgr.cpp        2014-06-12 15:47:22 +0000
> +++ src/core/StelLocationMgr.cpp        2014-07-19 07:57:49 +0000
> @@ -25,6 +25,13 @@
>  #include <QDebug>
>  #include <QFile>
>  #include <QDir>
> +#include <QtNetwork/QNetworkInterface>
> +#include <QtNetwork/QNetworkAccessManager>
> +#include <QEventLoop>
> +#include <QNetworkRequest>
> +#include <QNetworkReply>
> +#include <QUrl>
> +#include <QUrlQuery>
>
>  StelLocationMgr::StelLocationMgr()
>  {
> @@ -307,3 +314,99 @@
>         sourcefile.close();
>         return true;
>  }
> +
> +
> +//! check if there is an IP connection.
> +//  Along the lines of
> +//
> http://karanbalkar.com/2014/02/detect-internet-connection-using-qt-5-framework/
> +//#define DEBUG 1
> +bool StelLocationMgr::ipConnectionExists() const
> +{
> +    QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
> +    bool connectionExists = false;
> +
> +    for (int i = 0; i < ifaces.count(); i++) {
> +
> +        QNetworkInterface iface = ifaces.at(i);
> +        if ( iface.flags().testFlag(QNetworkInterface::IsUp)
> +             && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
> +
> +#ifdef DEBUG
> +            // details of connection
> +            qDebug() << "name:" << iface.name() << endl
> +                     << "mac:" << iface.hardwareAddress() << endl
> +                     << "ip addresses:" << endl;
> +#endif
> +                for (int j=0; j<iface.addressEntries().count(); j++) {
> +#ifdef DEBUG
> +                qDebug() << iface.addressEntries().at(j).ip().toString()
> +                         << " / " <<
> iface.addressEntries().at(j).netmask().toString() << endl;
> +#endif
> +                // got an interface which is up, and has an ip address
> +                if (connectionExists == false)
> +                    connectionExists = true;
> +            }
> +        }
> +    }
> +    return connectionExists;
> +}
> +
> +//! lookup location from IP address.
> +//  Along the lines of:
> +//
> http://karanbalkar.com/2014/02/sending-a-http-request-using-qt-5-framework/
> +const StelLocation StelLocationMgr::locationFromIP()
> +{
> +// create custom temporary event loop on stack
> +    QEventLoop eventLoop;
> +
> +    // "quit()" the event-loop, when the network request "finished()"
> +    QNetworkAccessManager mgr;
> +    QObject::connect(&mgr, SIGNAL(finished(QNetworkReply*)), &eventLoop,
> SLOT(quit()));
> +
> +    // the HTTP request
> +    QNetworkRequest req( QUrl( QString("http://freegeoip.net/csv/") ) );
> +    QNetworkReply *reply = mgr.get(req);
> +    eventLoop.exec(); // blocks stack until "finished()" has been called
> +
> +    StelLocation location;
> +    if (reply->error() == QNetworkReply::NoError) {
> +        //success
> +        QByteArray answer=reply->readAll();
> +        qDebug() << "Success: read CSV for approximate IP-based location:
> \n\t" << answer;
> +        // TODO: parse answer (CSV string), fill location
> +
> +        const QStringList& splitline = QString(answer).split(",");
> +        float latitude=splitline.at(7).mid(1, splitline.at
> (7).length()-2).toFloat();
> +        float longitude=splitline.at(8).mid(1, splitline.at
> (8).length()-2).toFloat();
> +        // answer/splitline example:
> "222.222.222.222","AT","Austria","","","","","47.3333","13.3333","",""
> +        // The parts from freegeoip are:
> ip,country_code,country_name,region_code,region_name,city,zipcode,latitude,longitude,metro_code,area_code
> +        QString locLine= // we re-pack into a new line that will be
> parsed back by StelLocation...
> +                QString("%1\t%2\t%3\t%4\t%5\t%6\t%7\t0")
> +                    .arg(splitline.at(5).length()>2 ? splitline.at(5).mid(1,
> splitline.at(5).length()-2)  : QString("IP%1").arg(splitline.at(0).mid(1,
> splitline.at(0).length()-2)))
> +                    .arg(splitline.at(4).length()>2 ? splitline.at(4).mid(1,
> splitline.at(4).length()-2)  : "IPregion")
> +                    .arg(splitline.at(2).length()>2 ? splitline.at(2).mid(1,
> splitline.at(2).length()-2) : "IPcountry") // country
> +                    .arg("X") // role: X=user-defined
> +                    .arg(0)   // population: unknown
> +                    .arg(latitude<0 ? QString("%1S").arg(-latitude, 0,
> 'f', 6) : QString("%1N").arg(latitude, 0, 'f', 6))
> +                    .arg(longitude<0 ? QString("%1W").arg(-longitude, 0,
> 'f', 6) : QString("%1E").arg(longitude, 0, 'f', 6));
> +                    //.arg(0); // altitude: unknown
> +                    //.arg(bortleScaleIndex)
> +                    //.arg("")         // Reserve for time zone
> +                    //.arg(planetName) // will be set to Earth by default
> anyway.
> +                    //.arg(landscapeKey); // we don't have that here...
> +
> +        qDebug() << "locLine: " << locLine;
> +
> +        location=StelLocation::createFromLine(locLine);
> +
> +    }
> +    else {
> +        //failure
> +        qDebug() << "Failure getting IP-based location: \n\t"
> <<reply->errorString();
> +    }
> +
> +
> +
> +    delete reply;
> +    return location;
> +}
>
> === modified file 'src/core/StelLocationMgr.hpp'
> --- src/core/StelLocationMgr.hpp        2013-10-14 07:43:06 +0000
> +++ src/core/StelLocationMgr.hpp        2014-07-19 07:57:49 +0000
> @@ -70,6 +70,12 @@
>         //! @param id the location ID
>         bool deleteUserLocation(const QString& id);
>
> +       // GZ 201407 blueprint: find location via IP lookup
> +       //! check if there is an IP connection
> +       bool ipConnectionExists() const;
> +       //! find location via online lookup of IP address
> +       const StelLocation locationFromIP();
> +
>  private:
>         void generateBinaryLocationFile(const QString& txtFile, bool
> isUserLocation, const QString& binFile) const;
>
> @@ -84,6 +90,7 @@
>         QMap<QString, StelLocation> locations;
>
>         StelLocation lastResortLocation;
> +
>  };
>
>  #endif // _STELLOCATIONMGR_HPP_
>
> === modified file 'src/gui/LocationDialog.cpp'
> --- src/gui/LocationDialog.cpp  2014-03-21 18:03:55 +0000
> +++ src/gui/LocationDialog.cpp  2014-07-19 07:57:49 +0000
> @@ -41,6 +41,7 @@
>  #include <QTimer>
>  #include <QStringListModel>
>
> +#include <QMessageBox>
>  LocationDialog::LocationDialog(QObject* parent) : StelDialog(parent),
> isEditingNew(false)
>  {
>         ui = new Ui_locationDialogForm;
> @@ -100,6 +101,7 @@
>
>         connect(ui->addLocationToListPushButton, SIGNAL(clicked()), this,
> SLOT(addCurrentLocationToList()));
>         connect(ui->deleteLocationFromListPushButton, SIGNAL(clicked()),
> this, SLOT(deleteCurrentLocationFromList()));
> +       connect(ui->ipQueryPushButton, SIGNAL(clicked()), this,
> SLOT(ipQueryLocation()));
>
>         StelCore* core = StelApp::getInstance().getCore();
>         const StelLocation& currentLocation = core->getCurrentLocation();
> @@ -235,7 +237,7 @@
>  // Update the map for the given location.
>  void LocationDialog::setMapForLocation(const StelLocation& loc)
>  {
> -       // Avoids usless processing
> +       // Avoids useless processing
>         if (lastPlanet==loc.planetName)
>                 return;
>
> @@ -487,3 +489,19 @@
>         ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
>         ui->pushButtonReturnToDefault->setEnabled(!currentIsDefault);
>  }
> +
> +// called when the user clicks on the IP Query button
> +void LocationDialog::ipQueryLocation()
> +{
> +       StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
> +       if (locMgr.ipConnectionExists())
> +       {
> +               StelLocation loc = locMgr.locationFromIP();
> +               StelApp::getInstance().getCore()->moveObserverTo(loc, 0.0,
> 0.0);
> +               //Update the position of the map pointer and GUI fields.
> +               setFieldsFromLocation(loc);
> +               ui->mapLabel->setCursorPos(loc.longitude, loc.latitude);
> +       }
> +       else
> +               QMessageBox::warning(0, "Stellarium", q_("IP query for
> location failed. Are you offline?"));
> +}
>
> === modified file 'src/gui/LocationDialog.hpp'
> --- src/gui/LocationDialog.hpp  2013-10-14 09:27:54 +0000
> +++ src/gui/LocationDialog.hpp  2014-07-19 07:57:49 +0000
> @@ -97,6 +97,9 @@
>
>         //! Called when the user clicks on the delete button
>         void deleteCurrentLocationFromList();
> +
> +       //! called when the user clicks on the IP Query button
> +       void ipQueryLocation();
>
>         //! Called when the user wants to use the current location as
> default
>         void setDefaultLocation();
>
> === modified file 'src/gui/locationDialogGui.ui'
> --- src/gui/locationDialogGui.ui        2014-06-16 13:43:31 +0000
> +++ src/gui/locationDialogGui.ui        2014-07-19 07:57:49 +0000
> @@ -449,6 +449,19 @@
>               </spacer>
>              </item>
>              <item>
> +             <widget class="QPushButton" name="ipQueryPushButton">
> +              <property name="minimumSize">
> +               <size>
> +                <width>30</width>
> +                <height>0</height>
> +               </size>
> +              </property>
> +              <property name="text">
> +               <string>IP Query</string>
> +              </property>
> +             </widget>
> +            </item>
> +            <item>
>               <widget class="QPushButton"
> name="deleteLocationFromListPushButton">
>                <property name="enabled">
>                 <bool>false</bool>
>
>
>