rbutil: rework and rename the "dont overwrite talkfiles" option so it really generates only new Talkfiles.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23162 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 21 insertions, 8 deletions

diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp
index bc3f5f9..a069f3a 100644
--- a/rbutil/rbutilqt/base/talkfile.cpp
+++ b/rbutil/rbutilqt/base/talkfile.cpp
@@ -140,6 +140,13 @@ bool TalkFileCreator::createTalkList(QDir startDir)
             // insert into List
             if(!dir.dirName().isEmpty() && m_talkFolders)
             {
+                // check if we should ignore it
+                if(m_generateOnlyNew && QFileInfo(dir.path() + "/_dirname.talk").exists())
+                {
+                    continue;
+                }
+                
+                //generate entry
                 TalkGenerator::TalkEntry entry;                
                 entry.toSpeak = dir.dirName();
                 entry.wavfilename = QDir::tempPath()+ "/talkfiles/" + QCryptographicHash::hash(entry.toSpeak.toUtf8(),
@@ -150,7 +157,7 @@ bool TalkFileCreator::createTalkList(QDir startDir)
                 entry.voiced = false;
                 entry.encoded = false;
                 qDebug() << "toSpeak: " << entry.toSpeak << " target: " << entry.target << " intermediates: " << 
-                            entry.wavfilename << entry.talkfilename;
+                        entry.wavfilename << entry.talkfilename;
                 m_talkList.append(entry);
             }
         }
@@ -171,6 +178,12 @@ bool TalkFileCreator::createTalkList(QDir startDir)
                 if(match)
                     continue;
                 
+                // check if we should ignore it
+                if(m_generateOnlyNew && QFileInfo(fileInf.path() + "/" + fileInf.fileName() + ".talk").exists())
+                {
+                    continue;
+                }
+                
                 //generate entry
                 TalkGenerator::TalkEntry entry;
                 if(m_stripExtensions)
@@ -223,7 +236,7 @@ bool TalkFileCreator::copyTalkFiles(QString* errString)
             continue; // this file was skipped in one of the previous steps
         }
         // remove target if it exists, and if we should overwrite it
-        if(m_overwriteTalk && QFile::exists(m_talkList[i].target))
+        if(QFile::exists(m_talkList[i].target))
             QFile::remove(m_talkList[i].target);
 
         // copying
diff --git a/rbutil/rbutilqt/base/talkfile.h b/rbutil/rbutilqt/base/talkfile.h
index 9c59693..b7b4c5b 100644
--- a/rbutil/rbutilqt/base/talkfile.h
+++ b/rbutil/rbutilqt/base/talkfile.h
@@ -40,7 +40,7 @@ public:
     void setDir(QDir dir){m_dir = dir; }
     void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; }
 
-    void setOverwriteTalk(bool ov) {m_overwriteTalk = ov;}
+    void setGenerateOnlyNew(bool ov) {m_generateOnlyNew = ov;}
     void setRecursive(bool ov) {m_recursive = ov;}
     void setStripExtensions(bool ov) {m_stripExtensions = ov;}
     void setTalkFolders(bool ov) {m_talkFolders = ov;} 
@@ -67,7 +67,7 @@ private:
     QDir   m_dir;
     QString m_mountpoint;
  
-    bool m_overwriteTalk;
+    bool m_generateOnlyNew;
     bool m_recursive;
     bool m_stripExtensions;
     bool m_talkFolders;
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index de41dca..c4ec8b7 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -216,9 +216,9 @@
        </widget>
       </item>
       <item row="7" column="0">
-       <widget class="QCheckBox" name="OverwriteTalk">
+       <widget class="QCheckBox" name="GenerateOnlyNew">
         <property name="text">
-         <string>Overwrite Talkfiles</string>
+         <string>Create only new Talkfiles</string>
         </property>
         <property name="checked">
          <bool>true</bool>
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index e8b2c29..25a6273 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -33,7 +33,7 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent)
     connect(ui.change,SIGNAL(clicked()),this,SLOT(change()));
 
     ui.recursive->setChecked(true);
-    ui.OverwriteTalk->setChecked(true);
+    ui.GenerateOnlyNew->setChecked(true);
     ui.StripExtensions->setChecked(true);
     
     updateSettings();
@@ -103,7 +103,7 @@ void InstallTalkWindow::accept()
     talkcreator->setDir(QDir(folderToTalk));
     talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString());
     
-    talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked());
+    talkcreator->setGenerateOnlyNew(ui.GenerateOnlyNew->isChecked());
     talkcreator->setRecursive(ui.recursive->isChecked());
     talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
     talkcreator->setTalkFolders(ui.talkFolders->isChecked());