Hmm, I don't get where you choose between countries in that change

On Wed, Feb 3, 2016 at 4:37 PM, Alexandre Abreu <
<email address hidden>> wrote:

> Alexandre Abreu has proposed merging
> lp:~abreu-alexandre/unity-webapps-qml/location-specific-homepage into
> lp:unity-webapps-qml.
>
> Commit message:
> Homepage as a URL or a per-country url object
>
> Requested reviews:
>   WebApps (webapps)
> Related bugs:
>   Bug #1523464 in webapp-container: "Amazon web app on the launcher in
> 16.04 sends me to .COM instead of .co.uk"
>   https://bugs.launchpad.net/webapp-container/+bug/1523464
>
> For more details, see:
>
> https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml/location-specific-homepage/+merge/284918
>
> Homepage as a URL or a per-country url object
> --
> Your team WebApps is requested to review the proposed merge of
> lp:~abreu-alexandre/unity-webapps-qml/location-specific-homepage into
> lp:unity-webapps-qml.
>
> === modified file
> 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp'
> --- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp
>       2014-05-14 01:41:14 +0000
> +++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp
>       2016-02-03 15:36:20 +0000
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2013 Canonical Ltd.
> + * Copyright 2013-2016 Canonical Ltd.
>   *
>   * This file is part of unity-webapps-qml.
>   *
> @@ -16,12 +16,13 @@
>   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>
> -#include <QTextStream>
> -#include <QJsonDocument>
> -#include <QJsonObject>
> -#include <QJsonArray>
> -#include <QJsonValue>
> -#include <QDebug>
> +#include <QtCore/QDebug>
> +#include <QtCore/QJsonDocument>
> +#include <QtCore/QJsonObject>
> +#include <QtCore/QJsonArray>
> +#include <QtCore/QJsonValue>
> +#include <QtCore/QTextStream>
> +#include <QtCore/QVariantMap>
>
>  #include "unity-webapps-app-manifest-parser.h"
>
> @@ -62,6 +63,33 @@
>      return ManifestFileInfoOption(infos);
>  }
>
> +WebappHomepage UnityWebappsAppManifestParser::extractHomepage(
> +        const QJsonValue& o)
> +{
> +    WebappHomepage homepage;
> +    if (o.isString())
> +    {
> +        homepage.homepageURI = QUrl::fromUserInput(o.toString());
> +        return homepage;
> +    }
> +
> +    if (o.isObject())
> +    {
> +        QVariantMap vm = o.toVariant().toMap();
> +        Q_FOREACH(const QString& k, vm.keys())
> +        {
> +            if (vm[k].canConvert(QVariant::String))
> +            {
> +                homepage.homepagePerCountry[k.toLower()] =
> +                        QUrl::fromUserInput(vm[k].toString());
> +            }
> +        }
> +        return homepage;
> +    }
> +
> +    return homepage;
> +}
> +
>  bool UnityWebappsAppManifestParser::parseWebappDeclaration(const
> QJsonObject& json,
>
> ManifestFileInfo * infos)
>  {
> @@ -70,20 +98,31 @@
>          if (  !json.contains(QLatin1String(property)) \
>             || !json.value(QLatin1String(property)).predicate()) \
>          { \
> -            qDebug() << "Invalid webapp webapp definition:" << property
> << "not found or fails predicate" << #predicate; \
> +            qDebug() << "Invalid webapp webapp definition:" \
> +                     << property \
> +                     << "not found or fails predicate" \
> +                     << #predicate; \
>              return false; \
>          } \
>      } while(0)
>
>      VALIDATE_PROPERTY_TYPE("name",isString);
>      VALIDATE_PROPERTY_TYPE("domain",isString);
> -    VALIDATE_PROPERTY_TYPE("homepage",isString);
>      VALIDATE_PROPERTY_TYPE("includes",isArray);
>  #undef VALIDATE_PROPERTY_TYPE
>
> +    if (  !json.contains(QLatin1String("homepage"))
> +       && (  !json.value(QLatin1String("homepage")).isString()
> +          || !json.value(QLatin1String("homepage")).isObject())
> +          )
> +    {
> +        qDebug() << "Invalid webapp webapp definition: homepage not found
> or not a string or object ";
> +        return false;
> +    }
> +
>      infos->name = json.value(QLatin1String("name")).toString();
>      infos->domain = json.value(QLatin1String("domain")).toString();
> -    infos->homepage = json.value(QLatin1String("homepage")).toString();
> +    infos->homepage =
> extractHomepage(json.value(QLatin1String("homepage")));
>      infos->includes = parseArray(json, QLatin1String("includes"));
>
>      // Script & requires (script source dependancies found in common/)
>
> === modified file
> 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h'
> --- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h
> 2014-05-12 18:27:51 +0000
> +++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h
> 2016-02-03 15:36:20 +0000
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2013 Canonical Ltd.
> + * Copyright 2013-2016 Canonical Ltd.
>   *
>   * This file is part of unity-webapps-qml.
>   *
> @@ -19,12 +19,26 @@
>  #ifndef __UNITY_WEBAPPS_APP_MANIFEST_H__
>  #define __UNITY_WEBAPPS_APP_MANIFEST_H__
>
> -#include <QString>
> -#include <QStringList>
> -#include <QFileInfo>
> +#include <QtCore/QFileInfo>
> +#include <QtCore/QMap>
> +#include <QtCore/QString>
> +#include <QtCore/QStringList>
> +#include <QtCore/QUrl>
>
>  #include "unity-webapps-common-priv.h"
>
> +
> +/**
> + * @brief Homepage for a webapp
> + *
> + * A homepage can either be a plain single string or
> + * a per-country (geobased) URL.
> + */
> +struct WebappHomepage {
> +    QUrl homepageURI;
> +    QMap<QString, QUrl> homepagePerCountry;
> +};
> +
>  /*!
>   * \brief Data view of a given WebApp manifest
>   *
> @@ -36,8 +50,8 @@
>      QString name;
>      // Domain associated with the WebApp (TLD)
>      QString domain;
> -    // Homepage that should be used when the webapp is being launched
> -    QString homepage;
> +    //  that should be used when the webapp is being launched
> +    WebappHomepage homepage;
>      // List of urls for which the WebApp applies (wildcard are allowed)
>      QStringList includes;
>      // List of javascript files that correspond to script names for the
> WebApp
> @@ -109,6 +123,8 @@
>       */
>      bool parseWebappDeclaration(const QJsonObject& json,
>                                  ManifestFileInfo * infos);
> +
> +    WebappHomepage extractHomepage(const QJsonValue& value);
>  };
>
>  #endif // __UNITY_WEBAPPS_APP_MANIFEST_H__
>
> === modified file
> 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
> --- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp  2015-01-08
> 19:36:38 +0000
> +++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp  2016-02-03
> 15:36:20 +0000
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2013 Canonical Ltd.
> + * Copyright 2013-2016 Canonical Ltd.
>   *
>   * This file is part of unity-webapps-qml.
>   *
> @@ -545,8 +545,20 @@
>          return webapp.data.manifest.domain;
>
>      case Homepage:
> -        return webapp.data.manifest.homepage;
> +    {
> +        if ( ! webapp.data.manifest.homepage.homepageURI.isEmpty())
> +        {
> +            return webapp.data.manifest.homepage.homepageURI;
> +        }
>
> +        QVariantMap vm;
> +        Q_FOREACH(const QString& k,
> +                  webapp.data.manifest.homepage.homepagePerCountry.keys())
> +        {
> +            vm[k] = webapp.data.manifest.homepage.homepagePerCountry[k];
> +        }
> +        return vm;
> +    }
>      case Urls:
>          return webapp.data.manifest.includes;
>
>
> === modified file
> 'tests/unit/test_plugin/data/installed-webapps/unity-webapps-valid/manifest.json'
> ---
> tests/unit/test_plugin/data/installed-webapps/unity-webapps-valid/manifest.json
>    2013-08-27 14:36:15 +0000
> +++
> tests/unit/test_plugin/data/installed-webapps/unity-webapps-valid/manifest.json
>    2016-02-03 15:36:20 +0000
> @@ -1,14 +1,34 @@
>  {
> -    "includes": ["http://www.bbc.co.uk/news", "http://www.bbc.*/news/*"],
> -    "requires": ["utils.js"],
> -    "name": "BBCNews-valid",
> -    "scripts": ["valid.user.js"],
> +    "architecture": "all",
> +    "description": "description of myapp",
> +    "domain": "bbc.co.uk",
> +    "framework": "ubuntu-sdk-15.04",
> +    "homepage": "http://www.bbc.co.uk/news/",
> +    "hooks": {
> +        "myapp": {
> +            "apparmor": "myapp.apparmor",
> +            "desktop": "myapp.desktop"
> +        }
> +    },
> +    "icons": {
> +        "128": "128/unity-webapps-bbc.png"
> +    },
> +    "includes": [
> +        "http://www.bbc.co.uk/news",
> +        "http://www.bbc.*/news/*"
> +    ],
> +    "integration-version": "2.3",
> +    "license": "GPL-3",
>      "maintainer": "Webapps Team <email address hidden>",
>      "manifest-version": "1.0",
> -    "integration-version": "2.3",
> +    "name": "bbcnews-valid",
>      "package-name": "BBCNews",
> -    "icons": {"128":"128/unity-webapps-bbc.png"},
> -    "domain":"bbc.co.uk",
> -    "homepage":"http://www.bbc.co.uk/news/",
> -    "license":"GPL-3"
> +    "requires": [
> +        "utils.js"
> +    ],
> +    "scripts": [
> +        "valid.user.js"
> +    ],
> +    "title": "myapp",
> +    "version": "0.1"
>  }
>
> === modified file
> 'tests/unit/test_plugin/data/installed-webapps/unity-webapps-with-requires-valid/manifest.json'
> ---
> tests/unit/test_plugin/data/installed-webapps/unity-webapps-with-requires-valid/manifest.json
>      2013-06-05 14:24:44 +0000
> +++
> tests/unit/test_plugin/data/installed-webapps/unity-webapps-with-requires-valid/manifest.json
>      2016-02-03 15:36:20 +0000
> @@ -1,14 +1,34 @@
>  {
> -    "includes": ["http://www.bbc.co.uk/news/", "http://www.bbc.com/news/
> "],
> -    "requires": ["utils.js"],
> -    "name": "with-requires-valid",
> -    "scripts": ["valid.user.js"],
> +    "architecture": "all",
> +    "description": "description of myapp",
> +    "domain": "bbc.co.uk",
> +    "framework": "ubuntu-sdk-15.04",
> +    "homepage": "http://www.bbc.co.uk/news/",
> +    "hooks": {
> +        "myapp": {
> +            "apparmor": "myapp.apparmor",
> +            "desktop": "myapp.desktop"
> +        }
> +    },
> +    "icons": {
> +        "128": "128/unity-webapps-bbc.png"
> +    },
> +    "includes": [
> +        "http://www.bbc.co.uk/news/",
> +        "http://www.bbc.com/news/"
> +    ],
> +    "integration-version": "2.3",
> +    "license": "GPL-3",
>      "maintainer": "Webapps Team <email address hidden>",
>      "manifest-version": "1.0",
> -    "integration-version": "2.3",
> +    "name": "with-requires-valid",
>      "package-name": "BBCNews",
> -    "icons": {"128":"128/unity-webapps-bbc.png"},
> -    "domain":"bbc.co.uk",
> -    "homepage":"http://www.bbc.co.uk/news/",
> -    "license":"GPL-3"
> +    "requires": [
> +        "utils.js"
> +    ],
> +    "scripts": [
> +        "valid.user.js"
> +    ],
> +    "title": "myapp",
> +    "version": "0.1"
>  }
>
> === added file
> 'tests/unit/test_plugin/data/manifests/valid-manifest-per-country-homepage.json'
> ---
> tests/unit/test_plugin/data/manifests/valid-manifest-per-country-homepage.json
>     1970-01-01 00:00:00 +0000
> +++
> tests/unit/test_plugin/data/manifests/valid-manifest-per-country-homepage.json
>     2016-02-03 15:36:20 +0000
> @@ -0,0 +1,17 @@
> +{
> +    "includes": ["http://www.bbc.co.uk/news/", "http://www.bbc.com/news/
> "],
> +    "requires": ["utils.js"],
> +    "name": "BBCNews",
> +    "scripts": ["BBCNews.user.js"],
> +    "maintainer": "Webapps Team <email address hidden>",
> +    "manifest-version": "1.0",
> +    "integration-version": "2.3",
> +    "package-name": "BBCNews",
> +    "icons": {"128":"128/unity-webapps-bbc.png"},
> +    "domain":"bbc.co.uk",
> +    "homepage": {
> +        "Country": "http://www.bbc.co.uk/news/",
> +        "Country2": "http://www.bbc.co.uk/news/"
> +    },
> +    "license":"GPL-3"
> +}
>
> === modified file 'tests/unit/test_plugin/test_plugin.pro'
> --- tests/unit/test_plugin/test_plugin.pro      2014-05-12 18:27:51 +0000
> +++ tests/unit/test_plugin/test_plugin.pro      2016-02-03 15:36:20 +0000
> @@ -53,4 +53,8 @@
>
>  QMAKE_EXTRA_TARGETS += check
>
> +DISTFILES += \
> +    data/manifests/valid-manifest-per-country-homepage.json \
> +    data/webapps-with-per-country-homepage-valid/manifest.json
> +
>
>
> === modified file 'tests/unit/test_plugin/tst_webappsAppModel.cpp'
> --- tests/unit/test_plugin/tst_webappsAppModel.cpp      2014-07-17
> 13:41:45 +0000
> +++ tests/unit/test_plugin/tst_webappsAppModel.cpp      2016-02-03
> 15:36:20 +0000
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2013 Canonical Ltd.
> + * Copyright 2013-2016 Canonical Ltd.
>   *
>   * This file is part of unity-webapps-qml.
>   *
> @@ -25,6 +25,7 @@
>  #include <QSignalSpy>
>  #include <QJsonDocument>
>  #include <QTest>
> +#include <QVariantMap>
>  #include <QDir>
>
>  #include "plugin/unity-webapps-app-model.h"
> @@ -126,8 +127,9 @@
>      UnityWebappsAppModel
>              model;
>      model.setSearchPath(VALID_INSTALLED_WEBAPPS_SEARCH_PATH);
> -
> +qDebug() << VALID_INSTALLED_WEBAPPS_COUNT;
>      const int FOUND_COUNT = model.rowCount();
> +    qDebug() << FOUND_COUNT;
>      QCOMPARE(FOUND_COUNT, VALID_INSTALLED_WEBAPPS_COUNT);
>
>      int i = 0;
> @@ -188,3 +190,27 @@
>          QVERIFY(model.getSingleInlineWebappName() == "MyWebApp");
>      }
>  }
> +
> +void WebappsAppModelTest::testWebappPerCountryHomepage()
> +{
> +    const QFileInfoList VALID_INSTALLED_WEBAPPS_SEARCH_PATHS =
> +        QDir(VALID_INSTALLED_WEBAPPS_SEARCH_PATH)
> +         .entryInfoList (QStringList("*-per-country-homepage-valid")
> +                         , QDir::Dirs);
> +
> +    QVERIFY(VALID_INSTALLED_WEBAPPS_SEARCH_PATHS.count() > 0);
> +
> +    Q_FOREACH(const QFileInfo & fileInfo,
> VALID_INSTALLED_WEBAPPS_SEARCH_PATHS)
> +    {
> +        UnityWebappsAppModel
> +                model;
> +        model.setSearchPath(fileInfo.absoluteFilePath());
> +
> +        QVERIFY(model.rowCount() > 0);
> +
> +        QVERIFY(model.data(0,
> UnityWebappsAppModel::Homepage).canConvert(QVariant::Map));
> +        QVariantMap vm = model.data(0,
> UnityWebappsAppModel::Homepage).toMap();
> +        QVERIFY(vm.find("country") != vm.end());
> +        QVERIFY(*vm.find("country") == "http://www.bbc.co.uk/news/");
> +    }
> +}
>
> === modified file 'tests/unit/test_plugin/tst_webappsAppModel.h'
> --- tests/unit/test_plugin/tst_webappsAppModel.h        2014-05-08
> 15:32:17 +0000
> +++ tests/unit/test_plugin/tst_webappsAppModel.h        2016-02-03
> 15:36:20 +0000
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2013 Canonical Ltd.
> + * Copyright 2013-2016 Canonical Ltd.
>   *
>   * This file is part of unity-webapps-qml.
>   *
> @@ -40,6 +40,7 @@
>      void testWebappsContentWithRequiresModel();
>      void testWebappsModelUrlMatch();
>      void testSimplifiedManifestInstall();
> +    void testWebappPerCountryHomepage();
>
>  private:
>
>
>
>