[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 108429] K3B informs the user of filenames beeing too long when
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2006-04-11 12:18:07
Message-ID: 20060411121807.11871.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=108429         
sebastian trueg de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From sebastian trueg de  2006-04-11 14:18 -------
SVN commit 528555 by trueg:

Warn about shortened filenames before starting the burning.

BUG: 108429


 M  +1 -0      ChangeLog  
 M  +17 -0     libk3b/projects/datacd/k3bdatajob.cpp  
 M  +2 -0      libk3b/projects/datacd/k3bdatajob.h  
 M  +0 -11     libk3b/projects/datacd/k3bisoimager.cpp  
 M  +17 -0     libk3b/projects/datadvd/k3bdvdjob.cpp  
 M  +2 -0      libk3b/projects/datadvd/k3bdvdjob.h  
 M  +12 -1     libk3b/projects/mixedcd/k3bmixedjob.cpp  
 M  +1 -1      libk3b/projects/movixcd/k3bmovixjob.cpp  
 M  +1 -1      libk3b/projects/movixdvd/k3bmovixdvdjob.cpp  


--- branches/stable/extragear/multimedia/k3b/ChangeLog #528554:528555
 @ -8,6 +8,7  @
  * Fixed the "invalid url" bug.
  * Use SG IO for scsi commands with newer linux kernels. This should fix problems with scsi device
    detection.
+ * Warn about shortened filenames due to Joliet restrictions before starting the burning process.
 
 0.12.14
 =======
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/datacd/k3bdatajob.cpp #528554:528555
 @ -134,6 +134,17  @
 
   emit newTask( i18n("Preparing data") );
 
+  d->doc->prepareFilenames();
+  if( d->doc->needToCutFilenames() ) {
+    if( !questionYesNo( i18n("Some filenames need to be shortened due to the %1 char restriction "
+			     "of the Joliet extensions. Continue anyway?")
+			.arg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) ) ) {
+      emit canceled();
+      emit finished( false );
+      return;
+    }
+  }
+  
   if( d->usedMultiSessionMode == K3bDataDoc::AUTO && !d->doc->onlyCreateImages() )
     determineMultiSessionMode();
   else
 @ -885,4 +896,10  @
       .arg(KIO::convertSize( d->doc->size() ));
 }
 
+
+bool K3bDataJob::hasBeenCanceled() const
+{
+  return d->canceled;
+}
+
 #include "k3bdatajob.moc"
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/datacd/k3bdatajob.h #528554:528555
 @ -47,6 +47,8  @
   K3bDoc* doc() const;
   K3bDevice::Device* writer() const;
 
+  virtual bool hasBeenCanceled() const;
+
   virtual QString jobDescription() const;
   virtual QString jobDetails() const;
 		
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/datacd/k3bisoimager.cpp #528554:528555
 @ -443,17 +443,6  @
   kdDebug() << s << endl << flush;
   emit debuggingOutput("mkisofs command:", s);
 
-  if( m_doc->needToCutFilenames() ) {
-    if( !questionYesNo( i18n("Some filenames need to be shortened due to the %1 char restriction "
-			     "of the Joliet extensions. Continue anyway?")
-			.arg( m_doc->isoOptions().jolietLong() ? 103 : 64 ) ) ) {
-      emit canceled();
-      emit finished( false );
-      cleanup();
-      return;
-    }
-  }
-  
   if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput) ) {
     // something went wrong when starting the program
     // it "should" be the executable
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/datadvd/k3bdvdjob.cpp #528554:528555
 @ -98,6 +98,17  @
   emit started();
   emit newTask( i18n("Preparing data") );
 
+  m_doc->prepareFilenames();
+  if( m_doc->needToCutFilenames() ) {
+    if( !questionYesNo( i18n("Some filenames need to be shortened due to the %1 char restriction "
+			     "of the Joliet extensions. Continue anyway?")
+			.arg( m_doc->isoOptions().jolietLong() ? 103 : 64 ) ) ) {
+      emit canceled();
+      emit finished( false );
+      return;
+    }
+  }
+
   m_canceled = false;
   m_writingStarted = false;
   d->copies = m_doc->copies();
 @ -774,4 +785,10  @
       .arg(KIO::convertSize( m_doc->size() ));
 }
 
+
+bool K3bDvdJob::hasBeenCanceled() const
+{
+  return m_canceled;
+}
+
 #include "k3bdvdjob.moc"
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/datadvd/k3bdvdjob.h #528554:528555
 @ -48,6 +48,8  @
   K3bDoc* doc() const;
   K3bDevice::Device* writer() const;
 
+  virtual bool hasBeenCanceled() const;
+
   virtual QString jobDescription() const;
   virtual QString jobDetails() const;
 
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/mixedcd/k3bmixedjob.cpp #528554:528555
 @ -142,8 +142,19  @
   m_doc->audioDoc()->setHideFirstTrack( false );   // unsupported
   m_doc->dataDoc()->setBurner( m_doc->burner() );  // so the isoImager can read ms data
 
-  emit newTask( i18n("Preparing write process") );
+  emit newTask( i18n("Preparing data") );
 
+  m_doc->dataDoc()->prepareFilenames();
+  if( m_doc->dataDoc()->needToCutFilenames() ) {
+    if( !questionYesNo( i18n("Some filenames need to be shortened due to the %1 char restriction "
+			     "of the Joliet extensions. Continue anyway?")
+			.arg( m_doc->dataDoc()->isoOptions().jolietLong() ? 103 : 64 ) ) ) {
+      emit canceled();
+      emit finished( false );
+      return;
+    }
+  }
+
   determineWritingMode();
 
   // depending on the mixed type and if it's onthefly or not we
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/movixcd/k3bmovixjob.cpp #528554:528555
 @ -103,7 +103,7  @
 {
   m_movixDocPreparer->removeMovixStructures();
 
-  if( m_canceled )
+  if( m_canceled || m_dataJob->hasBeenCanceled() )
     emit canceled();
 
   emit finished( success );
--- branches/stable/extragear/multimedia/k3b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp #528554:528555
 @ -102,7 +102,7  @
 {
   m_movixDocPreparer->removeMovixStructures();
 
-  if( m_canceled )
+  if( m_canceled || m_dvdJob->hasBeenCanceled() )
     emit canceled();
 
   emit finished( success );
[prev in list] [next in list] [prev in thread] [next in thread]