Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2014-06-18 07:50:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2014-05-20 14:22:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new/kfilemetadata5.changes 2014-06-18 07:53:05.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 3 21:24:36 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0 + * Beta 2 of Plasma 5 release +- Add Source URL + +------------------------------------------------------------------- Old: ---- kfilemetadata-4.96.0.tar.xz New: ---- kfilemetadata5-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.j52hZz/_old 2014-06-18 07:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.j52hZz/_new 2014-06-18 07:53:06.000000000 +0200 @@ -17,13 +17,15 @@ Name: kfilemetadata5 -Version: 4.96.0 +Version: 4.97.0 Release: 0 Summary: Extract Metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 Group: Development/Libraries/KDE Url: http://www.kde.org/ -Source0: kfilemetadata-%{version}.tar.xz +Source: http://download.kde.org/unstable/plasma/%{version}/src/kfilemetadata5-%{version}.tar.xz +# needs libzip -> needs libepub +#Source1: baselibs.conf BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: karchive-devel >= 4.97.0 BuildRequires: kf5-filesystem ++++++ kfilemetadata-4.96.0.tar.xz -> kfilemetadata5-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/CMakeLists.txt new/kfilemetadata-4.97.0/CMakeLists.txt --- old/kfilemetadata-4.96.0/CMakeLists.txt 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/CMakeLists.txt 2014-06-05 15:58:24.000000000 +0200 @@ -84,3 +84,6 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + +include(ECMOptionalAddSubdirectory) +ecm_optional_add_subdirectory(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/autotests/indexerextractortests.cpp new/kfilemetadata-4.97.0/autotests/indexerextractortests.cpp --- old/kfilemetadata-4.96.0/autotests/indexerextractortests.cpp 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/autotests/indexerextractortests.cpp 2014-06-05 15:57:21.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.96.0/po/CMakeLists.txt new/kfilemetadata-4.97.0/po/CMakeLists.txt --- old/kfilemetadata-4.96.0/po/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kfilemetadata-4.97.0/po/CMakeLists.txt 2014-06-05 15:58:24.000000000 +0200 @@ -0,0 +1,13 @@ +# The pofiles macro creates in some versions same name targets +# which since cmake 2.8 leads to target clashes. +# Hence force the old policy for all po directories. +# http://public.kitware.com/Bug/view.php?id=12952 +cmake_policy(SET CMP0002 OLD) + +find_package(Gettext REQUIRED) +if (NOT GETTEXT_MSGMERGE_EXECUTABLE) +MESSAGE(FATAL_ERROR "Please install msgmerge binary") +endif (NOT GETTEXT_MSGMERGE_EXECUTABLE) +if (NOT GETTEXT_MSGFMT_EXECUTABLE) +MESSAGE(FATAL_ERROR "Please install msgmerge binary") +endif (NOT GETTEXT_MSGFMT_EXECUTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_epubextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_epubextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_epubextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_epubextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=EPub-Extraktion für KFileMetaData Name[el]=Εξαγωγέας EPub KFileMetaData Name[es]=Extractor de EPub para KFileMetaData +Name[et]=KFileMetaData EPubi ekstraktimine Name[fi]=KFileMetaDatan EPub-lukuohjelma Name[fr]=Extracteur EPub de KFileMetaData Name[gl]=Extractor de EPub de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_exiv2extractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_exiv2extractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_exiv2extractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_exiv2extractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=Exiv2-Extraktion für KFileMetaData Name[el]=Εξαγωγέας Exiv2 KFileMetaData Name[es]=Extractor de Exiv2 para KFileMetaData +Name[et]=KFileMetaData Exiv2 ekstraktimine Name[fi]=KFileMetaDatan Exiv2-lukuohjelma Name[fr]=Extracteur Exiv2 de KFileMetaData Name[gl]=Extractor de Exiv2 de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_ffmpegextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_ffmpegextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_ffmpegextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_ffmpegextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=FFmpeg-Extraktion für KFileMetaData Name[el]=Εξαγωγέας FFmpeg KFileMetaData Name[es]=Extractor de FFmpeg para KFileMetaData +Name[et]=KFileMetaData FFmpegi ekstraktimine Name[fi]=KFileMetaDatan FFmpeg-lukuohjelma Name[fr]=Extracteur FFmpeg de KFileMetaData Name[gl]=Extractor de FFmpeg de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_mobiextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_mobiextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_mobiextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_mobiextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=Mobi-Extraktion für KFileMetaData Name[el]=Εξαγωγέας Mobi KFileMetaData Name[es]=Extractor de Mobi para KFileMetaData +Name[et]=KFileMetaData Mobi ekstraktimine Name[fi]=KFileMetaDatan Mobi-lukuohjelma Name[fr]=Extracteur Mobi de KFileMetaData Name[gl]=Extractor de Mobi de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_odfextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_odfextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_odfextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_odfextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=ODF-Extraktion für KFileMetaData Name[el]=Εξαγωγέας Odf KFileMetaData Name[es]=Extractor de Odf para KFileMetaData +Name[et]=KFileMetaData Odfi ekstraktimine Name[fi]=KFileMetaDatan Odf-lukuohjelma Name[fr]=Extracteur Odf de KFileMetaData Name[gl]=Extractor de Odf de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_office2007extractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_office2007extractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_office2007extractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_office2007extractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=Office 2007-Extraktion für KFileMetaData Name[el]=Εξαγωγέας Office2007 KFileMetaData Name[es]=Extractor de Office2007 para KFileMetaData +Name[et]=KFileMetaData Office2007 ekstraktimine Name[fi]=KFileMetaDatan Office2007-lukuohjelma Name[fr]=Extracteur Office2007 de KFileMetaData Name[gl]=Extractor de Office2007 de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_officeextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_officeextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_officeextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_officeextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=Office-Extraktion für KFileMetaData Name[el]=Εξαγωγέας Office KFileMetaData Name[es]=Extractor de Office para KFileMetaData +Name[et]=KFileMetaData Office'i ekstraktimine Name[fi]=KFileMetaDatan Office-lukuohjelma Name[fr]=Extracteur Office de KFileMetaData Name[gl]=Extractor de Office de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_plaintextextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_plaintextextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_plaintextextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_plaintextextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=Extraktion von einfachen Text für KFileMetaData Name[el]=Εξαγωγέας απλού κειμένου KFileMetaData Name[es]=Extractor de texto sin formato para KFileMetaData +Name[et]=KFileMetaData lihtteksti ekstraktimine Name[fi]=KFileMetaDatan muotoilemattoman tekstin lukuohjelma Name[fr]=Extracteur texte brut de KFileMetaData Name[gl]=Extractor de texto simple de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_popplerextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_popplerextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_popplerextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_popplerextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=Poppler-Extraktion für KFileMetaData Name[el]=Εξαγωγέας Poppler KFileMetaData Name[es]=Extractor de Poppler para KFileMetaData +Name[et]=KFileMetaData Poppleri ekstraktimine Name[fi]=KFileMetaDatan Poppler-lukuohjelma Name[fr]=Extracteur Poppler de KFileMetaData Name[gl]=Extractor de Poppler de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_taglibextractor.desktop new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_taglibextractor.desktop --- old/kfilemetadata-4.96.0/src/extractors/kfilemetadata_taglibextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/kfilemetadata_taglibextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -11,6 +11,7 @@ Name[de]=TagLib-Extraktion für KFileMetaData Name[el]=Εξαγωγέας TagLib KFileMetaData Name[es]=Extractor de TagLib para KFileMetaData +Name[et]=KFileMetaData TagLibi ekstraktimine Name[fi]=KFileMetaDatan TagLib-lukuohjelma Name[fr]=Extracteur TagLib de KFileMetaData Name[gl]=Extractor de TagLib de KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/extractors/plaintextextractor.cpp new/kfilemetadata-4.97.0/src/extractors/plaintextextractor.cpp --- old/kfilemetadata-4.96.0/src/extractors/plaintextextractor.cpp 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/extractors/plaintextextractor.cpp 2014-06-05 15:57:21.000000000 +0200 @@ -19,10 +19,8 @@ #include "plaintextextractor.h" - #include <QFile> -#include <QTextStream> -#include <QDebug> +#include <fstream> #include <KService> using namespace KFileMetaData; @@ -40,31 +38,23 @@ 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; } K_PLUGIN_FACTORY(factory, registerPlugin<PlainTextExtractor>();) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-4.96.0/src/kfilemetadataextractor.desktop new/kfilemetadata-4.97.0/src/kfilemetadataextractor.desktop --- old/kfilemetadata-4.96.0/src/kfilemetadataextractor.desktop 2014-05-12 15:04:30.000000000 +0200 +++ new/kfilemetadata-4.97.0/src/kfilemetadataextractor.desktop 2014-06-05 15:57:21.000000000 +0200 @@ -10,6 +10,7 @@ Comment[de]=KFileMetaData-Extraktion Comment[el]=Εξαγωγέας KFileMetaData Comment[es]=Extractor para KFileMetaData +Comment[et]=KFileMetaData ekstraktimine Comment[fi]=KFileMetaDatan lukuohjelma Comment[fr]=Extracteur de KFileMetaData Comment[gl]=Extractor de KFileMetaData -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
