diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/talkfile.cpp | 17 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/talkfile.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkfrm.ui | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 4 |
4 files changed, 21 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp index bc3f5f965d..a069f3aa78 100644 --- a/rbutil/rbutilqt/base/talkfile.cpp +++ b/rbutil/rbutilqt/base/talkfile.cpp | |||
@@ -140,6 +140,13 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
140 | // insert into List | 140 | // insert into List |
141 | if(!dir.dirName().isEmpty() && m_talkFolders) | 141 | if(!dir.dirName().isEmpty() && m_talkFolders) |
142 | { | 142 | { |
143 | // check if we should ignore it | ||
144 | if(m_generateOnlyNew && QFileInfo(dir.path() + "/_dirname.talk").exists()) | ||
145 | { | ||
146 | continue; | ||
147 | } | ||
148 | |||
149 | //generate entry | ||
143 | TalkGenerator::TalkEntry entry; | 150 | TalkGenerator::TalkEntry entry; |
144 | entry.toSpeak = dir.dirName(); | 151 | entry.toSpeak = dir.dirName(); |
145 | entry.wavfilename = QDir::tempPath()+ "/talkfiles/" + QCryptographicHash::hash(entry.toSpeak.toUtf8(), | 152 | entry.wavfilename = QDir::tempPath()+ "/talkfiles/" + QCryptographicHash::hash(entry.toSpeak.toUtf8(), |
@@ -150,7 +157,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
150 | entry.voiced = false; | 157 | entry.voiced = false; |
151 | entry.encoded = false; | 158 | entry.encoded = false; |
152 | qDebug() << "toSpeak: " << entry.toSpeak << " target: " << entry.target << " intermediates: " << | 159 | qDebug() << "toSpeak: " << entry.toSpeak << " target: " << entry.target << " intermediates: " << |
153 | entry.wavfilename << entry.talkfilename; | 160 | entry.wavfilename << entry.talkfilename; |
154 | m_talkList.append(entry); | 161 | m_talkList.append(entry); |
155 | } | 162 | } |
156 | } | 163 | } |
@@ -171,6 +178,12 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
171 | if(match) | 178 | if(match) |
172 | continue; | 179 | continue; |
173 | 180 | ||
181 | // check if we should ignore it | ||
182 | if(m_generateOnlyNew && QFileInfo(fileInf.path() + "/" + fileInf.fileName() + ".talk").exists()) | ||
183 | { | ||
184 | continue; | ||
185 | } | ||
186 | |||
174 | //generate entry | 187 | //generate entry |
175 | TalkGenerator::TalkEntry entry; | 188 | TalkGenerator::TalkEntry entry; |
176 | if(m_stripExtensions) | 189 | if(m_stripExtensions) |
@@ -223,7 +236,7 @@ bool TalkFileCreator::copyTalkFiles(QString* errString) | |||
223 | continue; // this file was skipped in one of the previous steps | 236 | continue; // this file was skipped in one of the previous steps |
224 | } | 237 | } |
225 | // remove target if it exists, and if we should overwrite it | 238 | // remove target if it exists, and if we should overwrite it |
226 | if(m_overwriteTalk && QFile::exists(m_talkList[i].target)) | 239 | if(QFile::exists(m_talkList[i].target)) |
227 | QFile::remove(m_talkList[i].target); | 240 | QFile::remove(m_talkList[i].target); |
228 | 241 | ||
229 | // copying | 242 | // copying |
diff --git a/rbutil/rbutilqt/base/talkfile.h b/rbutil/rbutilqt/base/talkfile.h index 9c596934ab..b7b4c5b5a1 100644 --- a/rbutil/rbutilqt/base/talkfile.h +++ b/rbutil/rbutilqt/base/talkfile.h | |||
@@ -40,7 +40,7 @@ public: | |||
40 | void setDir(QDir dir){m_dir = dir; } | 40 | void setDir(QDir dir){m_dir = dir; } |
41 | void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; } | 41 | void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; } |
42 | 42 | ||
43 | void setOverwriteTalk(bool ov) {m_overwriteTalk = ov;} | 43 | void setGenerateOnlyNew(bool ov) {m_generateOnlyNew = ov;} |
44 | void setRecursive(bool ov) {m_recursive = ov;} | 44 | void setRecursive(bool ov) {m_recursive = ov;} |
45 | void setStripExtensions(bool ov) {m_stripExtensions = ov;} | 45 | void setStripExtensions(bool ov) {m_stripExtensions = ov;} |
46 | void setTalkFolders(bool ov) {m_talkFolders = ov;} | 46 | void setTalkFolders(bool ov) {m_talkFolders = ov;} |
@@ -67,7 +67,7 @@ private: | |||
67 | QDir m_dir; | 67 | QDir m_dir; |
68 | QString m_mountpoint; | 68 | QString m_mountpoint; |
69 | 69 | ||
70 | bool m_overwriteTalk; | 70 | bool m_generateOnlyNew; |
71 | bool m_recursive; | 71 | bool m_recursive; |
72 | bool m_stripExtensions; | 72 | bool m_stripExtensions; |
73 | bool m_talkFolders; | 73 | bool m_talkFolders; |
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui index de41dca67d..c4ec8b718a 100644 --- a/rbutil/rbutilqt/installtalkfrm.ui +++ b/rbutil/rbutilqt/installtalkfrm.ui | |||
@@ -216,9 +216,9 @@ | |||
216 | </widget> | 216 | </widget> |
217 | </item> | 217 | </item> |
218 | <item row="7" column="0"> | 218 | <item row="7" column="0"> |
219 | <widget class="QCheckBox" name="OverwriteTalk"> | 219 | <widget class="QCheckBox" name="GenerateOnlyNew"> |
220 | <property name="text"> | 220 | <property name="text"> |
221 | <string>Overwrite Talkfiles</string> | 221 | <string>Create only new Talkfiles</string> |
222 | </property> | 222 | </property> |
223 | <property name="checked"> | 223 | <property name="checked"> |
224 | <bool>true</bool> | 224 | <bool>true</bool> |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index e8b2c292dd..25a6273b1a 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -33,7 +33,7 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | |||
33 | connect(ui.change,SIGNAL(clicked()),this,SLOT(change())); | 33 | connect(ui.change,SIGNAL(clicked()),this,SLOT(change())); |
34 | 34 | ||
35 | ui.recursive->setChecked(true); | 35 | ui.recursive->setChecked(true); |
36 | ui.OverwriteTalk->setChecked(true); | 36 | ui.GenerateOnlyNew->setChecked(true); |
37 | ui.StripExtensions->setChecked(true); | 37 | ui.StripExtensions->setChecked(true); |
38 | 38 | ||
39 | updateSettings(); | 39 | updateSettings(); |
@@ -103,7 +103,7 @@ void InstallTalkWindow::accept() | |||
103 | talkcreator->setDir(QDir(folderToTalk)); | 103 | talkcreator->setDir(QDir(folderToTalk)); |
104 | talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); | 104 | talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); |
105 | 105 | ||
106 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); | 106 | talkcreator->setGenerateOnlyNew(ui.GenerateOnlyNew->isChecked()); |
107 | talkcreator->setRecursive(ui.recursive->isChecked()); | 107 | talkcreator->setRecursive(ui.recursive->isChecked()); |
108 | talkcreator->setStripExtensions(ui.StripExtensions->isChecked()); | 108 | talkcreator->setStripExtensions(ui.StripExtensions->isChecked()); |
109 | talkcreator->setTalkFolders(ui.talkFolders->isChecked()); | 109 | talkcreator->setTalkFolders(ui.talkFolders->isChecked()); |