File unetbootin-locate-usb-devices.diff of Package unetbootin

Overview Repositories Revisions Requests Users Attributes Meta

File unetbootin-locate-usb-devices.diff of Package unetbootin (Revision 37ecbf4d186170da7fb3f1a3a38d63d7)

Currently displaying revision 37ecbf4d186170da7fb3f1a3a38d63d7 , Show latest

Index: unetbootin.cpp
===================================================================
--- unetbootin.cpp.orig
+++ unetbootin.cpp
@@ -508,17 +508,12 @@
 		}
 		#endif
 				#ifdef Q_OS_LINUX
-				QDir devlstdir("/dev/disk/by-id/");
+				QDir devlstdir("/dev/disk/by-path/");
 				QFileInfoList usbfileinfoL = devlstdir.entryInfoList(QDir::NoDotAndDotDot|QDir::Files);
 				for (int i = 0; i < usbfileinfoL.size(); ++i)
 				{
-//                    if (usbfileinfoL.at(i).contains(QRegExp("^usb-\\S{1,}-part\\d{1,}$")))
-//                    {
-//                        fulldrivelist.append(usbfileinfoL.at(i).canonicalFilePath());
-//                    }
-                    if (usbfileinfoL.at(i).fileName().contains(QRegExp("^usb-\\S{1,}$")) ||
-                        usbfileinfoL.at(i).fileName().contains(QRegExp("^mmc-\\S{1,}$")))
-                    {
+				    if (usbfileinfoL.at(i).fileName().contains(QRegExp("-usb-")))
+					{
 						if (!volidcommand.isEmpty())
 						{
 							if (QString(callexternapp(volidcommand, QString("-t %2").arg(usbfileinfoL.at(i).canonicalFilePath()))).contains(QRegExp("(vfat|ext2|ext3|ext4)")))
@@ -635,20 +630,7 @@
						}
					}
				}
-				/*
-				QString fdisklusbdevsS = callexternapp(fdiskcommand, "-l");
-				QStringList usbdevsL = QString(fdisklusbdevsS).split("\n").filter(QRegExp("\\.{0,}FAT|Disk\\.{0,}")).join("\n").split(" ").join("\n").split("\t").join("\n").split("\n").filter("/dev/");
-		for (int i = 0; i < usbdevsL.size(); ++i)
-		{
-			if (usbdevsL.at(i).contains(":"))
-			{
-				if (!QString(callexternapp(volidcommand, QString("-t %2").arg(QString(usbdevsL.at(i)).remove(":")))).contains("vfat"))
-					continue;
-			}
-			fulldrivelist.append(QString(usbdevsL.at(i)).remove(":"));
-				}
-				*/
-		#endif
+				#endif
 #ifdef Q_OS_MAC
 QString systemprofilertext = callexternapp("system_profiler", "SPStorageDataType");
 QRegExp filesystemregex("File System: (.+)\\n");

Places

File unetbootin-locate-usb-devices.diff of Package unetbootin (Revision 37ecbf4d186170da7fb3f1a3a38d63d7)

Places