lp:~jamesh/mediascanner2/external-metadata-extractor

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:mediascanner2 at revision 313

Jamie Strandboge (community): Approve on 2015-11-09

Michi Henning (community): Approve on 2015-11-09

PS Jenkins bot (community): Approve (continuous-integration) on 2015-11-08

Jussi Pakkanen (community): Needs Fixing on 2014-12-12

Diff: 2036 lines (+1153/-239)

27 files modified

CMakeLists.txt (+6/-0)
debian/mediascanner2.0.install (+2/-0)
debian/rules (+1/-0)
debian/usr.bin.mediascanner-service-2.0 (+0/-55)
debian/usr.lib.mediascanner-2.0.mediascanner-extractor (+119/-0)
src/daemon/CMakeLists.txt (+2/-5)
src/daemon/Scanner.cc (+2/-1)
src/daemon/SubtreeWatcher.cc (+2/-1)
src/daemon/scannerdaemon.cc (+4/-5)
src/extractor/CMakeLists.txt (+55/-0)
src/extractor/DetectedFile.hh (+47/-0)
src/extractor/ExtractorBackend.cc (+14/-79)
src/extractor/ExtractorBackend.hh (+47/-0)
src/extractor/MetadataExtractor.cc (+189/-0)
src/extractor/MetadataExtractor.hh (+6/-18)
src/extractor/com.canonical.MediaScanner2.Extractor.service.in (+3/-0)
src/extractor/dbus-interface.xml (+12/-0)
src/extractor/dbus-marshal.cc (+96/-0)
src/extractor/dbus-marshal.hh (+34/-0)
src/extractor/main.cc (+207/-0)
test/CMakeLists.txt (+22/-4)
test/basic.cc (+48/-29)
test/services/com.canonical.MediaScanner2.Extractor.service.in (+3/-0)
test/services/com.canonical.MediaScanner2.service.in (+3/-0)
test/test_extractorbackend.cc (+124/-0)
test/test_metadataextractor.cc (+89/-28)
test/test_qml.cc (+16/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1508142: Mediascanner crashes and loops on bad media (webm)

High

Fix Released

Link a bug report

Related blueprints

316. By James Henstridge on 2015-11-08

Add code to crash the metadata extractor after a certain number of
extractions so we can verify that it is correctly restarted.

315. By James Henstridge on 2015-11-07

Delay starting the test bus daemon, and use private connections to the
session bus to ensure we aren't reusing connections between test cases.

314. By James Henstridge on 2015-11-04

Recreate the GDBusProxy when we get the no reply error: the old proxy
will likely be bound to the old instance's unique name.

313. By James Henstridge on 2015-11-03

Add attach_disconnected flag to extractor's apparmor profile so it can
access /dev/socket/property_service.

312. By James Henstridge on 2015-11-02

Fix compile error.

311. By James Henstridge on 2015-11-02

Merge from trunk

310. By James Henstridge on 2015-10-22

Fix up QML tests to pass again.

309. By James Henstridge on 2015-10-22

Move playlist blacklisting code to the right location.

308. By James Henstridge on 2015-10-22

Update D-Bus API to handle extra fields on DetectedFile and MediaFile.

307. By James Henstridge on 2015-10-22

Merge from trunk