changeset 70:103ee4b82f30

Include only one set of rdf files (I was forgetting that of course S P O1 and S P O2 are not duplicates so will happily coexist & confuse matters). Install only if dialog not cancelled. + some RDF updates

--- a/installer.cpp	Thu Feb 13 11:34:55 2020 +0000
+++ b/installer.cpp	Thu Feb 13 13:53:48 2020 +0000
@@ -254,7 +254,7 @@
 };
 
 map<QString, int>
-getInstalledLibraryPluginVersions(QString libraryFilePath)
+getLibraryPluginVersions(QString libraryFilePath)
 {
     static QMutex mutex;
     static QString tempFileName;
@@ -433,7 +433,7 @@
     QString destination = target + "/" + library;
 
     if (QFileInfo(destination).exists()) {
-        auto installed = getInstalledLibraryPluginVersions(destination);
+        auto installed = getLibraryPluginVersions(destination);
         SVCERR << "Note: comparing installed plugin versions "
                << versionsString(installed)
                << " to packaged versions "
@@ -603,10 +603,9 @@
     QObject::connect(bb, SIGNAL(accepted()), &dialog, SLOT(accept()));
     QObject::connect(bb, SIGNAL(rejected()), &dialog, SLOT(reject()));
     
-    if (dialog.exec() == QDialog::Accepted) {
-        SVCERR << "accepted" << endl;
-    } else {
+    if (dialog.exec() != QDialog::Accepted) {
         SVCERR << "rejected" << endl;
+        return {};
     }
 
     map<QString, LibraryInfo> approved;

--- a/installer.qrc.in	Thu Feb 13 11:34:55 2020 +0000
+++ b/installer.qrc.in	Thu Feb 13 13:53:48 2020 +0000
@@ -6,23 +6,19 @@
   <file>out/azi@SUFFIX@</file>
   <file>out/bbc-vamp-plugins.cat</file>
   <file>out/bbc-vamp-plugins_COPYING.txt</file>
-  <file>out/bbc-vamp-plugins.n3</file>
   <file>out/bbc-vamp-plugins_README.md</file>
   <file>out/bbc-vamp-plugins@SUFFIX@</file>
   <file>out/beatroot-vamp.cat</file>
   <file>out/beatroot-vamp_CITATION.txt</file>
   <file>out/beatroot-vamp_COPYING.txt</file>
-  <file>out/beatroot-vamp.n3</file>
   <file>out/beatroot-vamp_README.txt</file>
   <file>out/beatroot-vamp@SUFFIX@</file>
   <file>out/cepstral-pitchtracker.cat</file>
-  <file>out/cepstral-pitchtracker.n3</file>
   <file>out/cepstral-pitchtracker_README.txt</file>
   <file>out/cepstral-pitchtracker@SUFFIX@</file>
   <file>out/cqvamp.cat</file>
   <file>out/cqvamp_CITATION.txt</file>
   <file>out/cqvamp_COPYING.txt</file>
-  <file>out/cqvamp.n3</file>
   <file>out/cqvamp_README.txt</file>
   <file>out/cqvamp@SUFFIX@</file>
   <file>out/fanchirp.cat</file>
@@ -33,60 +29,49 @@
   <file>out/match-vamp-plugin.cat</file>
   <file>out/match-vamp-plugin_CITATION.txt</file>
   <file>out/match-vamp-plugin_COPYING.txt</file>
-  <file>out/match-vamp-plugin.n3</file>
   <file>out/match-vamp-plugin_README.txt</file>
   <file>out/match-vamp-plugin@SUFFIX@</file>
   <file>out/mvamp.cat</file>
   <file>out/mvamp_COPYING.txt</file>
-  <file>out/mvamp.n3</file>
   <file>out/mvamp_README.txt</file>
   <file>out/mvamp@SUFFIX@</file>
   <file>out/nnls-chroma.cat</file>
   <file>out/nnls-chroma_CITATION.txt</file>
   <file>out/nnls-chroma_COPYING.txt</file>
-  <file>out/nnls-chroma.n3</file>
   <file>out/nnls-chroma_README.txt</file>
   <file>out/nnls-chroma@SUFFIX@</file>
   <file>out/pyin.cat</file>
   <file>out/pyin_COPYING.txt</file>
-  <file>out/pyin.n3</file>
   <file>out/pyin_README.txt</file>
   <file>out/pyin@SUFFIX@</file>
   <file>out/qm-vamp-plugins.cat</file>
   <file>out/qm-vamp-plugins_COPYING.txt</file>
-  <file>out/qm-vamp-plugins.n3</file>
   <file>out/qm-vamp-plugins_README.md</file>
   <file>out/qm-vamp-plugins@SUFFIX@</file>
   <file>out/segmentino.cat</file>
   <file>out/segmentino_CITATION.txt</file>
   <file>out/segmentino_COPYING.txt</file>
-  <file>out/segmentino.n3</file>
   <file>out/segmentino_README.txt</file>
   <file>out/segmentino@SUFFIX@</file>
   <file>out/silvet.cat</file>
   <file>out/silvet_CITATION.txt</file>
   <file>out/silvet_COPYING.txt</file>
-  <file>out/silvet.n3</file>
   <file>out/silvet_README.txt</file>
   <file>out/silvet@SUFFIX@</file>
   <file>out/simple-cepstrum.cat</file>
-  <file>out/simple-cepstrum.n3</file>
   <file>out/simple-cepstrum@SUFFIX@</file>
   <file>out/tempogram.cat</file>
   <file>out/tempogram_CITATION.txt</file>
   <file>out/tempogram_COPYING.txt</file>
-  <file>out/tempogram.n3</file>
   <file>out/tempogram_README.txt</file>
   <file>out/tempogram@SUFFIX@</file>
   <file>out/tipic.cat</file>
   <file>out/tipic_CITATION.txt</file>
   <file>out/tipic_COPYING.txt</file>
-  <file>out/tipic.n3</file>
   <file>out/tipic_README.txt</file>
   <file>out/tipic@SUFFIX@</file>
   <file>out/tuning-difference.cat</file>
   <file>out/tuning-difference_COPYING.txt</file>
-  <file>out/tuning-difference.n3</file>
   <file>out/tuning-difference_README.md</file>
   <file>out/tuning-difference@SUFFIX@</file>
   <file>out/ua-vamp-plugins.cat</file>
@@ -94,17 +79,14 @@
   <file>out/ua-vamp-plugins_README.md</file>
   <file>out/ua-vamp-plugins@SUFFIX@</file>
   <file>out/vamp-aubio.cat</file>
-  <file>out/vamp-aubio.n3</file>
   <file>out/vamp-aubio_COPYING.txt</file>
   <file>out/vamp-aubio_README.md</file>
   <file>out/vamp-aubio@SUFFIX@</file>
   <file>out/vamp-example-plugins.cat</file>
   <file>out/vamp-example-plugins_COPYING.txt</file>
-  <file>out/vamp-example-plugins.n3</file>
   <file>out/vamp-example-plugins@SUFFIX@</file>
   <file>out/vamp-libxtract.cat</file>
   <file>out/vamp-libxtract_COPYING.txt</file>
-  <file>out/vamp-libxtract.n3</file>
   <file>out/vamp-libxtract_README.txt</file>
   <file>out/vamp-libxtract@SUFFIX@</file>
   <file>out/vampy_COPYING.txt</file>

--- a/repoint-lock.json	Thu Feb 13 11:34:55 2020 +0000
+++ b/repoint-lock.json	Thu Feb 13 13:53:48 2020 +0000
@@ -28,7 +28,7 @@
       "pin": "af71cbdab621"
     },
     "tipic": {
-      "pin": "14823d51a573"
+      "pin": "1ea2aed23d4a"
     },
     "tuning-difference": {
       "pin": "8fd1c994f937"
@@ -91,7 +91,7 @@
       "pin": "ae30d91d2ffe"
     },
     "rdf": {
-      "pin": "bb90681dfd1b"
+      "pin": "c6416f243682"
     }
   }
 }