working toward allowing local files in running-scripts window

Seth Alves committed 10 years ago

Commit 3aa10901 parent b8877022 files · +32 −17Browse files

Showing the changes to libraries/script-engine/src/ScriptsModel.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptsModel.cpp+28−13

 #include <QUrl>
 #include <QUrlQuery>
 #include <QXmlStreamReader>
+#include <QDirIterator>
 #include <NetworkAccessManager.h>
 #include <PathUtils.h>
 void ScriptsModel::requestDefaultFiles(QString marker) {
     QUrl url(defaultScriptsLocation());
-    QUrlQuery query;
-    query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
-    if (!marker.isEmpty()) {
-        query.addQueryItem(MARKER_PARAMETER_NAME, marker);
-    }
-    url.setQuery(query);
-    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    if (url.isLocalFile()) {
-    QNetworkRequest request(url);
+        // QDirIterator it(url.toLocalFile(), QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
-    request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
+        // while (it.hasNext()) {
-    QNetworkReply* reply = networkAccessManager.get(request);
+        //     QString jsFile = it.next();;
-    connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
+        //     _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
+        //                                          defaultScriptsLocation() + "/" + jsFile,
+        //                                          SCRIPT_ORIGIN_DEFAULT));
+        // }
+    } else {
+        QUrlQuery query;
+        query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
+        if (!marker.isEmpty()) {
+            query.addQueryItem(MARKER_PARAMETER_NAME, marker);
+        }
+        url.setQuery(query);
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkRequest request(url);
+        request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
+        QNetworkReply* reply = networkAccessManager.get(request);
+        connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
+    }
 }
 void ScriptsModel::downloadFinished() {
         if (!data.isEmpty()) {
             finished = parseXML(data);
         } else {
-            qCDebug(scriptengine) << "Error: Received no data when loading remote scripts";
+            qCDebug(scriptengine) << "Error: Received no data when loading default scripts";
         }
+    } else {
+        qDebug() << "error is" << reply->error();
     }
     reply->deleteLater();
                 if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) {
                     xml.readNext();
                     lastKey = xml.text().toString();
+                    qDebug() << "lastKey = " << lastKey;
                     if (jsRegex.exactMatch(xml.text().toString())) {
                         _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
                                                              defaultScriptsLocation() + "/" + lastKey,
     // Error handling
     if (xml.hasError()) {
-        qCDebug(scriptengine) << "Error loading remote scripts: " << xml.errorString();
+        qCDebug(scriptengine) << "Error loading default scripts: " << xml.errorString();
         return true;
     }