Hello community, here is the log from the commit of package kfilemetadata for openSUSE:Factory checked in at 2014-05-26 14:40:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata" Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata/kfilemetadata.changes 2014-05-06 17:41:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata.new/kfilemetadata.changes 2014-05-26 14:40:29.000000000 +0200 @@ -1,0 +2,9 @@ +Fri May 9 16:39:46 UTC 2014 - [email protected] + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +i- Drop patch optimize.patch (Upstreamed) + +------------------------------------------------------------------- Old: ---- kfilemetadata-4.13.0.tar.xz optimize.patch New: ---- kfilemetadata-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata.spec ++++++ --- /var/tmp/diff_new_pack.dsuKIt/_old 2014-05-26 14:40:31.000000000 +0200 +++ /var/tmp/diff_new_pack.dsuKIt/_new 2014-05-26 14:40:31.000000000 +0200 @@ -17,14 +17,12 @@ Name: kfilemetadata -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Extract Metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 Group: System/GUI/KDE Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM optimize.patch -- Optimize word count in PlainTextExtractor -Patch0: optimize.patch BuildRequires: libepub-devel BuildRequires: libexiv2-devel BuildRequires: libkde4-devel @@ -47,7 +45,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake_kde4 -d build ++++++ kfilemetadata-4.13.0.tar.xz -> kfilemetadata-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.13.0/autotests/CMakeLists.txt new/kfilemetadata-4.13.1/autotests/CMakeLists.txt --- old/kfilemetadata-4.13.0/autotests/CMakeLists.txt 2014-04-09 09:58:41.000000000 +0200 +++ new/kfilemetadata-4.13.1/autotests/CMakeLists.txt 2014-05-09 13:17:52.000000000 +0200 @@ -1,7 +1,7 @@ configure_file(indexerextractortestsconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/indexerextractortestsconfig.h @ONLY) -kde4_add_unit_test(extractortests +kde4_add_unit_test(extractortests NOGUI indexerextractortests.cpp simpleresult.cpp ../src/extractors/plaintextextractor.cpp @@ -16,7 +16,7 @@ # # Property Info # -kde4_add_unit_test(propertyinfotest +kde4_add_unit_test(propertyinfotest NOGUI propertyinfotest.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.13.0/autotests/indexerextractortests.cpp new/kfilemetadata-4.13.1/autotests/indexerextractortests.cpp --- old/kfilemetadata-4.13.0/autotests/indexerextractortests.cpp 2014-04-09 09:58:41.000000000 +0200 +++ new/kfilemetadata-4.13.1/autotests/indexerextractortests.cpp 2014-05-09 13:17:52.000000000 +0200 @@ -42,10 +42,24 @@ void IndexerExtractorTests::benchMarkPlainTextExtractor() { - QScopedPointer<ExtractorPlugin> plugin(new PlainTextExtractor(this, QVariantList())); + PlainTextExtractor plugin(this, QVariantList()); - SimpleResult result(testFilePath("plain_text_file.txt"), "text/plain"); - plugin->extract(&result); + // generate a test file with varying number of words per line + QTemporaryFile file("XXXXXX.txt"); + QVERIFY(file.open()); + QByteArray chunk("foo bar "); + for (int line = 0; line < 10000; ++line) { + for (int i = 0; i < line % 100; ++i) { + file.write(chunk); + } + file.write("\n"); + } + + SimpleResult result(file.fileName(), "text/plain"); + + QBENCHMARK { + plugin.extract(&result); + } } void IndexerExtractorTests::testPlainTextExtractor() @@ -64,8 +78,7 @@ QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().first(), Type::Text); - QCOMPARE(result.properties().size(), 2); - QCOMPARE(result.properties().value(Property::WordCount), QVariant(17)); + QCOMPARE(result.properties().size(), 1); QCOMPARE(result.properties().value(Property::LineCount), QVariant(4)); content.replace(QLatin1Char('\n'), QLatin1Char(' ')); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.13.0/src/extractors/CMakeLists.txt new/kfilemetadata-4.13.1/src/extractors/CMakeLists.txt --- old/kfilemetadata-4.13.0/src/extractors/CMakeLists.txt 2014-04-09 09:58:41.000000000 +0200 +++ new/kfilemetadata-4.13.1/src/extractors/CMakeLists.txt 2014-05-09 13:17:52.000000000 +0200 @@ -116,7 +116,6 @@ target_link_libraries( kfilemetadata_plaintextextractor kfilemetadata ${KDE4_KIO_LIBS} - ${FFMPEG_LIBRARIES} ) install( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.13.0/src/extractors/plaintextextractor.cpp new/kfilemetadata-4.13.1/src/extractors/plaintextextractor.cpp --- old/kfilemetadata-4.13.0/src/extractors/plaintextextractor.cpp 2014-04-09 09:58:41.000000000 +0200 +++ new/kfilemetadata-4.13.1/src/extractors/plaintextextractor.cpp 2014-05-09 13:17:52.000000000 +0200 @@ -19,9 +19,9 @@ #include "plaintextextractor.h" - #include <QFile> -#include <QTextStream> + +#include <fstream> using namespace KFileMetaData; @@ -36,34 +36,25 @@ return QStringList() << QLatin1String("text/"); } -// TODO: Make this iterative! And remove the size filter void PlainTextExtractor::extract(ExtractionResult* result) { - QFile file(result->inputUrl()); + std::string line; + int lines = 0; - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + std::ifstream fstream(QFile::encodeName(result->inputUrl())); + if (!fstream.is_open()) { return; } - int lines = 0; - int words = 0; - - QRegExp wordsRegex("\\b\\w+\\b"); - - QTextStream ts(&file); - while (!ts.atEnd()) { - QString str = ts.readLine(); - result->append(str); + while (std::getline(fstream, line)) { + QByteArray arr = QByteArray::fromRawData(line.c_str(), line.size()); + result->append(QString::fromUtf8(arr)); lines += 1; - words += str.count(wordsRegex); } - result->add(Property::WordCount, words); result->add(Property::LineCount, lines); result->addType(Type::Text); - - return; } KFILEMETADATA_EXPORT_EXTRACTOR(KFileMetaData::PlainTextExtractor, "kfilemetadata_plaintextextractor") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.13.0/src/kfilemetadata_export.h new/kfilemetadata-4.13.1/src/kfilemetadata_export.h --- old/kfilemetadata-4.13.0/src/kfilemetadata_export.h 2014-04-09 09:58:41.000000000 +0200 +++ new/kfilemetadata-4.13.1/src/kfilemetadata_export.h 2014-05-09 13:17:52.000000000 +0200 @@ -27,7 +27,7 @@ # if defined(KDELIBS_STATIC_LIBS) /* No export/import for static libraries */ # define KFILEMETADATA_EXPORT -# elif defined(MAKE_KMETADATA_LIB) +# elif defined(MAKE_KFILEMETADATA_LIB) /* We are building this library */ # define KFILEMETADATA_EXPORT KDE_EXPORT # else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
