diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/autodetection.cpp | 18 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 8 |
2 files changed, 22 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/autodetection.cpp index 08c471718d..2300a1bba1 100644 --- a/rbutil/rbutilqt/autodetection.cpp +++ b/rbutil/rbutilqt/autodetection.cpp | |||
@@ -28,15 +28,28 @@ bool Autodetection::detect() | |||
28 | { | 28 | { |
29 | m_device = ""; | 29 | m_device = ""; |
30 | m_mountpoint = ""; | 30 | m_mountpoint = ""; |
31 | 31 | ||
32 | // Try detection via rockbox.info | 32 | // Try detection via rockbox.info / rbutil.log |
33 | QStringList mountpoints = getMountpoints(); | 33 | QStringList mountpoints = getMountpoints(); |
34 | 34 | ||
35 | for(int i=0; i< mountpoints.size();i++) | 35 | for(int i=0; i< mountpoints.size();i++) |
36 | { | 36 | { |
37 | // do the file checking | ||
37 | QDir dir(mountpoints.at(i)); | 38 | QDir dir(mountpoints.at(i)); |
38 | if(dir.exists()) | 39 | if(dir.exists()) |
39 | { | 40 | { |
41 | // check logfile first. | ||
42 | if(QFile(mountpoints.at(i) + "/.rockbox/rbutil.log").exists()) { | ||
43 | QSettings log(mountpoints.at(i) + "/.rockbox/rbutil.log", | ||
44 | QSettings::IniFormat, this); | ||
45 | if(!log.value("platform").toString().isEmpty()) { | ||
46 | m_device = log.value("platform").toString(); | ||
47 | m_mountpoint = mountpoints.at(i); | ||
48 | return true; | ||
49 | } | ||
50 | } | ||
51 | |||
52 | // check rockbox-info.txt afterwards. | ||
40 | QFile file(mountpoints.at(i) + "/.rockbox/rockbox-info.txt"); | 53 | QFile file(mountpoints.at(i) + "/.rockbox/rockbox-info.txt"); |
41 | if(file.exists()) | 54 | if(file.exists()) |
42 | { | 55 | { |
@@ -51,6 +64,7 @@ bool Autodetection::detect() | |||
51 | } | 64 | } |
52 | } | 65 | } |
53 | } | 66 | } |
67 | |||
54 | } | 68 | } |
55 | int n; | 69 | int n; |
56 | 70 | ||
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 24ce44b6b9..76baac44e0 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -125,8 +125,12 @@ void Install::done(bool error) | |||
125 | } | 125 | } |
126 | 126 | ||
127 | // no error, close the window, when the logger is closed | 127 | // no error, close the window, when the logger is closed |
128 | connect(logger,SIGNAL(closed()),this,SLOT(close())); | 128 | connect(logger,SIGNAL(closed()),this,SLOT(close())); |
129 | 129 | // add platform info to log file for later detection | |
130 | QSettings installlog(userSettings->value("defaults/mountpoint").toString() | ||
131 | + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | ||
132 | installlog.setValue("platform", userSettings->value("defaults/platform").toString()); | ||
133 | installlog.sync(); | ||
130 | } | 134 | } |
131 | 135 | ||
132 | 136 | ||