Merge branch 'dropsw' into 'master'

[tracker] Remove support for tracker-indexed apps, as those aren't indexed in Sailfish. Contributes JB#38022

See merge request !2

data/data.pro

@@ -15,10 +15,6 @@ testdata.files = \
     hl-examples.xml
 INSTALLS += testdata
 
-applications.path = /usr/share/applications
-applications.files = mimeapps.list
-INSTALLS += applications
-
 XML_FILES = highlight1.xml.in
 
 genreg.input = XML_FILES

data/gen-regexps

@@ -232,52 +232,4 @@ rx_test ("xxx ~http://maps.ovi.com/#|50.060185|19.9328789|11|0|0|normal.day~ and
 # Foreign letters are not part of a URL.
 rx_test ("xxx |www.10010.com|四川专区特惠活动进行中 xxx")
 
-# OVI Music URL
-
-ovimusicurl = rx_seq (rx_opt (rx_ci ("https?://")),
-                      "music\\.",
-                      rx_or (rx_seq (rx_ci ("ovi\\."),
-                                     rx_or (rx_ci ("mobi"), rx_ci ("com")),
-                                     rx_opt (rx_ci ("\\.cn"))),
-                             rx_seq (rx_opt (rx_ci ("mobi\\.")), rx_ci ("ovi\\.com\\.cn"))),
-                      rx_opt ("/"),
-                      rx_opt (hu_suffix))
-
-rx_output (ovimusicurl, "OVIMUSICURL")
-
-rx_test_setup (ovimusicurl, "ovimusic")
-
-rx_test ("xxx |http://music.ovi.com| xxx")
-rx_test ("xxx |http://music.ovi.mobi| xxx")
-rx_test ("xxx |http://music.ovi.com.cn| xxx")
-rx_test ("xxx |http://music.ovi.com/cn/zh/pc| xxx")
-rx_test ("xxx |http://music.ovi.mobi/fi/fi/pc| xxx")
-
-rx_test ("xxx (see also: |http://music.ovi.com|) ending ) should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com/|) ending ) should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com/file|) ending ) should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com/file/|) ending ) should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com|). note, dot should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com/|). ending ) should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com/file|). ending ) should not be included")
-rx_test ("xxx (see also: |http://music.ovi.com/file/|). xxx")
-
-rx_test ("xxx see also: |http://music.ovi.com|. dot should not be included")
-rx_test ("xxx see also: |http://music.ovi.com/|. dot should not be included")
-rx_test ("xxx see also: |http://music.ovi.com/file|. dot should not be included")
-rx_test ("xxx see also: |http://music.ovi.com/file/|. dot should not be included")
-
-rx_test ("xxx see also: |http://music.ovi.com|, comma should not be included")
-rx_test ("xxx see also: |http://music.ovi.com/|, comma should not be included")
-rx_test ("xxx see also: |http://music.ovi.com/file|, comma should not be included")
-rx_test ("xxx see also: |http://music.ovi.com/file/|, comma should not be included")
-
-rx_test ("xxxx See also: |http://music.ovi.com/something_(one_%26_two)| parenss included in the address...")
-rx_test ("xxxx See also: |http://music.ovi.com/something_(three_%26_four)|. ... but dot is not")
-rx_test ("xxxx See also: |http://music.ovi.com/something_(three_%26_four)|, ... but comma is not")
-
-rx_test ("xxxx (See also: |http://music.ovi.com/something_(five_%26_six)|) this might be tricky")
-rx_test ("testing also |music.ovi.com/(bar)baz(bar)bar|.")
-rx_test ("testing also |music.ovi.com/(bar)baz(bar)bar|, period.")
-
 rx_run ()

data/highlight1.xml.in

@@ -2,7 +2,6 @@
 <actions>
   <highlight regexp="([mM][aA][iI][lL][tT][oO]:)?[a-zA-Z0-9_!#$%&amp;'*+/=?^`{|}~-]+(\.[a-zA-Z0-9_!#$%&amp;'*+/=?^`{|}~-]+)*@([a-zA-Z0-9_-]+\.)+[a-zA-Z0-9_-]+" name="email-address"/>
   <highlight regexp="@PHONENUMBER@" name="phone-number"/>
-  <highlight regexp="@OVIMUSICURL@" name="ovi-music-url" specialCaseOf="http-url"/>
   <highlight regexp="@HTTPURL@" name="http-url"/>
   <highlight regexp="[fF][tT][pP]://([a-zA-Z0-9_]+((:[a-zA-Z0-9_]+)?)@)?([a-zA-Z0-9_\-]+\.)+[a-zA-Z0-9_\-]+(:\d+)?(/([a-zA-Z0-9_/?%:;@&amp;=+$,\-.!~*'#]*[a-zA-Z0-9_/?%:;@&amp;=+$,\-!~*'#]|\([a-zA-Z0-9_/?%:;@&amp;=+$,\-.!~*'#]*\))*)?" name="ftp-url"/>
   <highlight regexp="[fF][eE][eE][dD]:(//)?([a-zA-Z0-9_]+((:[a-zA-Z0-9_]+)?)@)?([a-zA-Z0-9_\-]+\.)+[a-zA-Z0-9_\-]+(:\d+)?(/([a-zA-Z0-9_/?%:;@&amp;=+$,\-.!~*'#]*[a-zA-Z0-9_/?%:;@&amp;=+$,\-!~*'#]|\([a-zA-Z0-9_/?%:;@&amp;=+$,\-.!~*'#]*\))*)?" name="feed-url"/>

data/tracker1.xml

@@ -10,10 +10,6 @@
     { ?uri a nfo:Image . }
   </tracker-condition>
 
-  <tracker-condition name="software-application">
-    { ?uri a nfo:Software . }
-  </tracker-condition>
-
   <tracker-condition name="calendar-event">
     { ?uri a ncal:Event . }
   </tracker-condition>

rpm/libcontentaction-qt5.spec

@@ -79,7 +79,6 @@ rm -rf %{buildroot}
 %{_datadir}/contentaction/highlight1.xml
 %{_datadir}/contentaction/tracker1.xml
 %{_libdir}/libcontentaction5.so.*
-%exclude %{_datadir}/applications/mimeapps.list
 
 %files devel
 %defattr(-,root,root,-)

src/tracker.cpp

@@ -43,7 +43,6 @@ namespace ContentAction {
 using namespace ContentAction::Internal;
 
 const QString OntologyMimeClass("x-maemo-nepomuk/");
-static const QString SoftwareApplicationMimeType("x-maemo-nepomuk/software-application");
 static const QString SparqlQuery("SparqlQuery");
 
 // Returns true if the \a uri is a valid IRI, warns otherwise.
@@ -148,8 +147,6 @@ QStringList Internal::mimeForTrackerObject(const QString& uri)
         // Don't consider mime types for which nobody defines an action,
         // except if it is `software-application' which is special case.
         QString pseudoMimeType(OntologyMimeClass + mimeType);
-        if (pseudoMimeType != SoftwareApplicationMimeType &&
-            appsForContentType(pseudoMimeType).isEmpty()) continue;
 
         if (checkTrackerCondition(conditions[mimeType], uri))
             mimeTypes << pseudoMimeType;
@@ -170,21 +167,6 @@ static QList<QStringList> mimeTypesForUris(const QStringList& uris)
     return allMimeTypes;
 }
 
-// Given a nfo:SoftwareApplication \a uri, constructs an Action, which
-// launches the corresponding application when triggered.
-static Action createSoftwareAction(const QString& uri)
-{
-    QString query("SELECT nie:url(<%1>) {}");
-    QDBusReply<QVector<QStringList> > reply = tracker()->call(SparqlQuery, query.arg(uri));
-    if (!reply.isValid())
-        return Action();
-    QString fileUri(reply.value()[0][0]);
-    if (fileUri.isEmpty())
-        return Action();
-    QUrl desktopFileUri(fileUri);
-    return createAction(desktopFileUri.toLocalFile(), QStringList());
-}
-
 /// Returns the default action for the given \a uri representing an object
 /// stored in Tracker.  A default action is determined by checking the \ref
 /// tracker_conditions "conditions" that apply to the \a uri, and taking the
@@ -201,8 +183,6 @@ Action Action::defaultAction(const QString& uri)
     QStringList mimeTypes = mimeForTrackerObject(uri);
     LCA_DEBUG << "pseudo-mimes" << mimeTypes;
     Q_FOREACH (const QString& mimeType, mimeTypes) {
-        if (mimeType == SoftwareApplicationMimeType)
-            return createSoftwareAction(uri);
         QString def = findDesktopFile(defaultAppForContentType(mimeType));
         if (!def.isEmpty())
             return createAction(def,
@@ -330,8 +310,6 @@ QList<Action> Action::actions(const QString& uri)
     QSet<QString> blackList; // for adding each action only once
     Q_FOREACH (const QString& mimeType, mimeTypes) {
         QStringList apps = appsForContentType(mimeType);
-        if (mimeType == SoftwareApplicationMimeType)
-            result << createSoftwareAction(uri);
         Q_FOREACH (const QString& appid, apps) {
             QString app = findDesktopFile(appid);
             if (!app.isEmpty()) {

tests/applications/applications.pro

@@ -23,8 +23,7 @@ desktop_tests.files = \
     gallerywithfilename.desktop \
     browser.desktop \
     special-browser.desktop \
-    regexpmatcher.desktop \
-    ovi-music.desktop
+    regexpmatcher.desktop 
 INSTALLS += desktop_tests
 
 unix{

tests/applications/mimeinfo.cache

@@ -11,7 +11,6 @@ x-maemo-nepomuk/music-piece=complexmusic.desktop
 x-maemo-urischeme/mailto=emailer.desktop
 x-maemo-highlight/email-address=emailer.desktop;
 x-maemo-highlight/http-url=browser.desktop;
-x-maemo-highlight/ovi-music-url=ovi-music.desktop;
 x-maemo-highlight/ftp-url=browser.desktop;
 x-maemo-highlight/feed-url=browser.desktop;
 x-maemo-highlight/phone-number=caller.desktop;

tests/test-actions.sh

@@ -26,11 +26,4 @@ uri="file:///tmp/test.html"
 a=$(lca-tool --file --print $uri)
 strstr "$a" '.*fixedparams' || exit 1
 
-appuri="file://$(abspath $srcdir)/applications/emailer.desktop"
-tracker-sparql -u -q "INSERT { <a.softwareapp> nie:url \"$appuri\" . }"
-a=$(lca-tool --tracker --print a.softwareapp)
-strstr "$a" '.*emailer' || exit 1
-a=$(lca-tool --tracker --printdefault a.softwareapp)
-test "$a" = "emailer" || exit 1
-
 exit 0

tests/test-highlight.sh

@@ -129,12 +129,5 @@ strstr "$res" ".*'http://maps.ovi.com/#|50.060185|19.9328789|11|0|0|normal.day'
 # A URL immediately followed by non-ascii letters.
 strstr "$res" ".*'www.10010.com' browser" || exit 10
 
-# music suite URLs
-strstr "$res" ".*'http://music.ovi.com' ovi-music browser" || exit 11
-strstr "$res" ".*'http://music.ovi.mobi' ovi-music browser" || exit 11
-strstr "$res" ".*'http://music.ovi.com.cn' ovi-music browser" || exit 11
-strstr "$res" ".*'http://music.ovi.com/cn/zh/pc' ovi-music browser" || exit 11
-strstr "$res" ".*'http://music.ovi.mobi/fi/fi/pc' ovi-music browser" || exit 11
-
 strstr "$res" ".*'"
 exit 0

tests/testdata.ttl

@@ -31,8 +31,6 @@
 	nie:url "file:///tmp/bbb.wav" ;
 	nie:mimeType "audio/wav" .
 
-<a.softwareapp> a nfo:SoftwareApplication, nie:DataObject .
-
 <a.contact> a nco:PersonContact .
 <b.phonenumber> a nco:PhoneNumber ;
 	nco:phoneNumber "555-334112" .