comparison data/fileio/FileFinder.cpp @ 316:3a6725f285d6

* Make RemoteFile far more pervasive, and use it for local files as well
  so that we can handle both transparently.  Make it shallow copy with
  reference counting, so it can be used by value without having to worry
  about the cache file lifetime.  Use RemoteFile for MainWindow file-open
  functions, etc

 QString
 FileFinder::find(FileType type, QString location, QString lastKnownLocation)
 {
     if (QFileInfo(location).exists()) return location;
 
-    if (RemoteFile::canHandleScheme(QUrl(location))) {
-        RemoteFile rf(location);
-        bool available = rf.isAvailable();
-        rf.deleteLocalFile();
-        if (available) return location;
+    if (RemoteFile::isRemote(location)) {
+        if (RemoteFile(location).isAvailable()) {
+            std::cerr << "FileFinder::find: ok, it's available... returning" << std::endl;
+            return location;
+        }
     }
 
     QString foundAt = "";
 
     if ((foundAt = findRelative(location, lastKnownLocation)) != "") {

               << relativeTo.toStdString() << "\"..." << std::endl;
 
     QString fileName;
     QString resolved;
 
-    if (RemoteFile::canHandleScheme(QUrl(location))) {
+    if (RemoteFile::isRemote(location)) {
         fileName = QUrl(location).path().section('/', -1, -1,
                                                  QString::SectionSkipEmpty);
     } else {
         fileName = QFileInfo(location).fileName();
     }
 
-    if (RemoteFile::canHandleScheme(QUrl(relativeTo))) {
+    if (RemoteFile::isRemote(relativeTo)) {
         resolved = QUrl(relativeTo).resolved(fileName).toString();
-        RemoteFile rf(resolved);
-        if (!rf.isAvailable()) resolved = "";
+        if (!RemoteFile(resolved).isAvailable()) resolved = "";
         std::cerr << "resolved: " << resolved.toStdString() << std::endl;
-        rf.deleteLocalFile();
     } else {
         resolved = QFileInfo(relativeTo).dir().filePath(fileName);
         if (!QFileInfo(resolved).exists() ||
             !QFileInfo(resolved).isFile() ||
             !QFileInfo(resolved).isReadable()) {

                 (0, tr("Use URL"),
                  tr("Please enter the URL to use for this file:"),
                  QLineEdit::Normal, "", &ok);
 
             if (ok && path != "") {
-                RemoteFile rf(path);
-                if (rf.isAvailable()) {
+                if (RemoteFile(path).isAvailable()) {
                     done = true;
                 } else {
                     QMessageBox::critical
                         (0, tr("Failed to open location"),
                          tr("URL \"%1\" could not be opened").arg(path));
                     path = "";
                 }
-                rf.deleteLocalFile();
             }
             break;
         }
 
         case 2: // Cancel