Thread: [Sv1-commits] SF.net SVN: sv1:[1329] sonic-visualiser/trunk/transform/FileFeatureWriter. cpp
Brought to you by:
cannam
From: <ca...@us...> - 2008-12-05 12:22:15
|
Revision: 1329 http://sv1.svn.sourceforge.net/sv1/?rev=1329&view=rev Author: cannam Date: 2008-12-05 11:31:51 +0000 (Fri, 05 Dec 2008) Log Message: ----------- * colon not permitted in filename on windows Modified Paths: -------------- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp =================================================================== --- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2008-12-05 11:24:13 UTC (rev 1328) +++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2008-12-05 11:31:51 UTC (rev 1329) @@ -182,7 +182,7 @@ QString filename; if (m_manyFiles && transformId != "") { - filename = QString("%1:%2.%3").arg(basename).arg(transformId).arg(m_extension); + filename = QString("%1-%2.%3").arg(basename).arg(transformId).arg(m_extension); } else { filename = QString("%1.%2").arg(basename).arg(m_extension); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-12-11 12:33:09
|
Revision: 1365 http://sv1.svn.sourceforge.net/sv1/?rev=1365&view=rev Author: cannam Date: 2008-12-11 12:32:59 +0000 (Thu, 11 Dec 2008) Log Message: ----------- * crappy attempt to handle writing to directory somewhere other than C drive on Windows Modified Paths: -------------- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp =================================================================== --- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2008-12-11 12:09:11 UTC (rev 1364) +++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2008-12-11 12:32:59 UTC (rev 1365) @@ -170,6 +170,7 @@ QString dirname, basename; QString infilename = url.toLocalFile(); + if (scheme.length() == 1) infilename = scheme + ":" + infilename; // DOS drive! if (infilename == "") infilename = url.path(); basename = QFileInfo(infilename).baseName(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-12-11 12:37:25
|
Revision: 1366 http://sv1.svn.sourceforge.net/sv1/?rev=1366&view=rev Author: cannam Date: 2008-12-11 12:37:16 +0000 (Thu, 11 Dec 2008) Log Message: ----------- ... Modified Paths: -------------- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp =================================================================== --- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2008-12-11 12:32:59 UTC (rev 1365) +++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2008-12-11 12:37:16 UTC (rev 1366) @@ -170,9 +170,13 @@ QString dirname, basename; QString infilename = url.toLocalFile(); - if (scheme.length() == 1) infilename = scheme + ":" + infilename; // DOS drive! - if (infilename == "") infilename = url.path(); + if (infilename == "") { + infilename = url.path(); + } basename = QFileInfo(infilename).baseName(); + if (scheme.length() == 1) { + infilename = scheme + ":" + infilename; // DOS drive! + } cerr << "trackId = " << trackId.toStdString() << ", url = " << url.toString().toStdString() << ", infilename = " << infilename.toStdString() << ", basename = " << basename.toStdString() << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2009-03-20 17:32:20
|
Revision: 1521 http://sv1.svn.sourceforge.net/sv1/?rev=1521&view=rev Author: cannam Date: 2009-03-20 17:32:16 +0000 (Fri, 20 Mar 2009) Log Message: ----------- * remove debug Modified Paths: -------------- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp =================================================================== --- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2009-03-20 17:32:05 UTC (rev 1520) +++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2009-03-20 17:32:16 UTC (rev 1521) @@ -289,7 +289,7 @@ void FileFeatureWriter::finish() { - cerr << "FileFeatureWriter::finish()" << endl; +// cerr << "FileFeatureWriter::finish()" << endl; if (m_singleFileName != "" || m_stdout) return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2010-05-24 16:04:16
|
Revision: 1704 http://sv1.svn.sourceforge.net/sv1/?rev=1704&view=rev Author: cannam Date: 2010-05-24 16:04:10 +0000 (Mon, 24 May 2010) Log Message: ----------- * Avoid failing on second and subsequent input files in single-output-file mode (because first input file caused output file to be open, so second input file failed because output "already existed") Modified Paths: -------------- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp =================================================================== --- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2010-05-24 16:03:41 UTC (rev 1703) +++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2010-05-24 16:04:10 UTC (rev 1704) @@ -218,7 +218,14 @@ FileFeatureWriter::testOutputFile(QString trackId, TransformId transformId) { - if (m_stdout) return; + // Obviously, if we're writing to stdout we can't test for an + // openable output file. But when writing a single file we don't + // want to either, because this test would fail on the second and + // subsequent input files (because the file would already exist). + // getOutputFile does the right thing in this case, so we just + // leave it to it + if (m_stdout || m_singleFileName != "") return; + QString filename = getOutputFilename(trackId, transformId); if (filename == "") { throw FailedToOpenOutputStream(trackId, transformId); @@ -266,7 +273,7 @@ m_files[key] = 0; throw FailedToOpenFile(filename); } - + m_files[key] = file; } @@ -281,7 +288,7 @@ if (!file && !m_stdout) { return 0; } - + if (m_streams.find(file) == m_streams.end()) { if (m_stdout) { m_streams[file] = new QTextStream(stdout); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2010-08-10 14:46:44
|
Revision: 1735 http://sv1.svn.sourceforge.net/sv1/?rev=1735&view=rev Author: cannam Date: 2010-08-10 14:46:38 +0000 (Tue, 10 Aug 2010) Log Message: ----------- * Fix csv-one-file option Modified Paths: -------------- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp =================================================================== --- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2010-08-10 14:45:54 UTC (rev 1734) +++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp 2010-08-10 14:46:38 UTC (rev 1735) @@ -90,7 +90,11 @@ if (m_support & SupportOneFileTotal) { if (m_support & ~SupportOneFileTotal) { // not only option p.name = "one-file"; - p.description = "Write all transform results for all input files into the single named output file."; + if (m_support & SupportOneFilePerTrack) { + p.description = "Write all transform results for all input files into the single named output file. (The default is to create one output file per input audio file, and write all transform results for that input into it.)"; + } else { + p.description = "Write all transform results for all input files into the single named output file. (The default is to create a separate output file for each combination of input audio file and transform.)"; + } p.hasArg = true; pl.push_back(p); } @@ -132,11 +136,16 @@ } else if (i->first == "one-file") { if (m_support & SupportOneFileTotal) { if (m_support & ~SupportOneFileTotal) { // not only option - if (m_manyFiles) { - cerr << "FileFeatureWriter::setParameters: WARNING: Both many-files and one-file parameters provided, ignoring one-file" << endl; - } else { + // No, we cannot do this test because m_manyFiles + // may be on by default (for any FileFeatureWriter + // that supports OneFilePerTrackTransform but not + // OneFilePerTrack), so we need to be able to + // override it +// if (m_manyFiles) { +// cerr << "FileFeatureWriter::setParameters: WARNING: Both many-files and one-file parameters provided, ignoring one-file" << endl; +// } else { m_singleFileName = i->second.c_str(); - } +// } } } } else if (i->first == "stdout") { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |