Changeset 968

Timestamp:

11/08/08 14:25:29 (2 months ago)

Author:

liamMT

Message:

- escape spaces in filepath for files to be uploaded

Location:

mchelper/branches/v25

Files:

• include/Preferences.h (modified) (1 diff)
• src/Inspector.cpp (modified) (1 diff)
• src/Uploader.cpp (modified) (2 diffs)

mchelper/branches/v25/include/Preferences.h

@@ -14 +14 @@
 #define DEFAULT_CHECK_UPDATES true
 
-#ifdef Q_WS_WIN
-  #define DEFAULT_SAM7_PATH "C:\something\sam7.exe"
-#else
-  #define DEFAULT_SAM7_PATH "/usr/bin/sam7"
-#endif
+#define DEFAULT_SAM7_PATH "/usr/bin/sam7" // only relevant for *nix 
 
 class MainWindow;

mchelper/branches/v25/src/Inspector.cpp

@@ -116 +116 @@
   {
     msgs << QString( "/system/name %1" ).arg( QString( "\"%1\"" ).arg( newName ) );
-    mainWindow->setBoardName( board->key(), QString( "%1 : %2" ).arg(newName).arg(board->location()) );
+    mainWindow->setBoardName( board->key(), QString( "%1 : %2" ).arg(newName).arg(board->key()) );
   }
     

mchelper/branches/v25/src/Uploader.cpp

@@ -61 +61 @@
   CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
   CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef, kCFURLPOSIXPathStyle);
-  QString uploaderName = CFStringGetCStringPtr(macPath, CFStringGetSystemEncoding());
-  uploaderName += "/Contents/Resources/sam7";
+  QDir appBundle( CFStringGetCStringPtr(macPath, CFStringGetSystemEncoding()) );
+  QString uploaderName = appBundle.filePath( "Contents/Resources/sam7" );
   #elif defined (Q_WS_WIN)
   QString uploaderName = QDir::current().filePath("sam7");
@@ -69 +69 @@
   QString uploaderName = settings.value("sam7_path", DEFAULT_SAM7_PATH).toString();
   #endif
+  int offset = 0; // escape any spaces in the filename
+  do
+  {
+    offset = filename.indexOf(" ", offset);
+    if( offset != -1 )
+    {
+      filename.insert(offset, "\\");
+      offset += 2; // step past the \ we inserted and the space we put it in front of
+    }
+  } while( offset != -1 );
+  qDebug( "uploading %s", qPrintable(filename));
+  
   QStringList uploaderArgs;
   uploaderArgs << "-e" << "set_clock";