started on making ~ mean the application directory in script paths

Seth Alves committed 10 years ago

Commit 7c0bb721 parent 2ad02944 files · +46 −20Browse files

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

Unified · Split

libraries/script-engine/src/ScriptsModel.cpp+6−14

         QString localDir = url.toLocalFile() + "/scripts";
         QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
         while (it.hasNext()) {
-            QString jsFullPath = it.next();
+            QString jsFullPath = normalizeScriptUrl(it.next());
-            QString jsPartialPath = jsFullPath.mid(localDir.length() + 1); // + 1 to skip a separator
+            QString jsPartialPath = normalizeScriptUrl(jsFullPath.mid(localDir.length() + 1)); // + 1 to skip a separator
-            #if defined(Q_OS_WIN) || defined(Q_OS_OSX)
-            jsFullPath = jsFullPath.toLower();
-            jsPartialPath = jsPartialPath.toLower();
-            #endif
             _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT));
         }
     } else {
             while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == CONTAINER_NAME)) {
                 if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) {
                     xml.readNext();
-                    lastKey = xml.text().toString();
+                    lastKey = normalizeScriptUrl(xml.text().toString());
                     if (jsRegex.exactMatch(xml.text().toString())) {
                         _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
                                                              defaultScriptsLocation() + "/" + lastKey,
     const QFileInfoList localFiles = _localDirectory.entryInfoList();
     for (int i = 0; i < localFiles.size(); i++) {
         QFileInfo file = localFiles[i];
-        QString fileName = file.fileName();
+        QString fileName = normalizeScriptUrl(file.fileName());
-        QString absPath = file.absoluteFilePath();
+        QString absPath = normalizeScriptUrl(file.absoluteFilePath());
-        #if defined(Q_OS_WIN) || defined(Q_OS_OSX)
-        fileName = fileName.toLower();
-        absPath = absPath.toLower();
-        #endif
         _treeNodes.append(new TreeNodeScript(fileName, absPath, SCRIPT_ORIGIN_LOCAL));
     }
     rebuildTree();
             for (pathIterator = pathList.constBegin(); pathIterator != pathList.constEnd(); ++pathIterator) {
                 hash.append(*pathIterator + "/");
                 if (!folders.contains(hash)) {
-                    folders[hash] = new TreeNodeFolder(*pathIterator, parent);
+                    folders[hash] = new TreeNodeFolder(normalizeScriptUrl(*pathIterator), parent);
                 }
                 parent = folders[hash];
             }