Release: 4111f284029e0f53b0411b6897f59d2b

This commit is contained in:
Dirk Alders 2020-01-31 08:12:39 +01:00
parent fb5cafc8cc
commit 488c70884b
4 changed files with 491 additions and 403 deletions

View File

@ -1,10 +1,10 @@
<?xml version="1.0" ?>
<coverage branch-rate="0.975" branches-covered="39" branches-valid="40" complexity="0" line-rate="0.9856" lines-covered="206" lines-valid="209" timestamp="1580423734911" version="4.5">
<coverage branch-rate="0.9762" branches-covered="41" branches-valid="42" complexity="0" line-rate="0.9857" lines-covered="207" lines-valid="210" timestamp="1580454618005" version="4.5">
<!-- Generated by coverage.py: https://coverage.readthedocs.io -->
<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
<sources/>
<packages>
<package branch-rate="0.975" complexity="0" line-rate="0.9856" name=".user_data.data.dirk.prj.unittest.media.pylibs.media">
<package branch-rate="0.9762" complexity="0" line-rate="0.9857" name=".user_data.data.dirk.prj.unittest.media.pylibs.media">
<classes>
<class branch-rate="1" complexity="0" filename="/user_data/data/dirk/prj/unittest/media/pylibs/media/__init__.py" line-rate="1" name="__init__.py">
<methods/>
@ -28,7 +28,7 @@
<line hits="1" number="50"/>
</lines>
</class>
<class branch-rate="0.9706" complexity="0" filename="/user_data/data/dirk/prj/unittest/media/pylibs/media/metadata.py" line-rate="0.9844" name="metadata.py">
<class branch-rate="0.9722" complexity="0" filename="/user_data/data/dirk/prj/unittest/media/pylibs/media/metadata.py" line-rate="0.9845" name="metadata.py">
<methods/>
<lines>
<line hits="1" number="1"/>
@ -114,48 +114,48 @@
<line hits="1" number="98"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="100"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="101"/>
<line hits="1" number="103"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="102"/>
<line hits="1" number="104"/>
<line hits="1" number="106"/>
<line hits="1" number="105"/>
<line hits="1" number="107"/>
<line hits="1" number="109"/>
<line hits="1" number="108"/>
<line hits="1" number="110"/>
<line hits="1" number="111"/>
<line hits="1" number="114"/>
<line hits="1" number="112"/>
<line hits="1" number="115"/>
<line hits="1" number="116"/>
<line hits="1" number="118"/>
<line hits="1" number="117"/>
<line hits="1" number="119"/>
<line hits="1" number="121"/>
<line hits="1" number="120"/>
<line hits="1" number="122"/>
<line hits="1" number="123"/>
<line hits="1" number="124"/>
<line hits="1" number="125"/>
<line hits="0" number="126"/>
<line hits="1" number="126"/>
<line hits="0" number="127"/>
<line hits="0" number="128"/>
<line hits="1" number="130"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="131"/>
<line hits="1" number="132"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="133"/>
<line hits="1" number="134"/>
<line hits="0" number="129"/>
<line hits="1" number="131"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="132"/>
<line hits="1" number="133"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="134"/>
<line hits="1" number="135"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="137"/>
<line hits="1" number="138"/>
<line hits="1" number="136"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="138"/>
<line hits="1" number="139"/>
<line hits="1" number="140"/>
<line hits="1" number="141"/>
<line hits="1" number="142"/>
<line hits="1" number="143"/>
<line hits="1" number="146"/>
<line hits="1" number="144"/>
<line hits="1" number="147"/>
<line hits="1" number="148"/>
<line hits="1" number="149"/>
<line hits="1" number="150"/>
<line hits="1" number="151"/>
<line hits="1" number="152"/>
<line hits="1" number="154"/>
<line hits="1" number="156"/>
<line hits="1" number="153"/>
<line hits="1" number="155"/>
<line hits="1" number="157"/>
<line hits="1" number="158"/>
<line hits="1" number="159"/>
@ -168,61 +168,62 @@
<line hits="1" number="166"/>
<line hits="1" number="167"/>
<line hits="1" number="168"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="169"/>
<line hits="1" number="169"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="170"/>
<line hits="1" number="171"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="171"/>
<line hits="1" number="172"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="173"/>
<line hits="1" number="174"/>
<line hits="1" number="173"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="174"/>
<line hits="1" number="175"/>
<line hits="1" number="179"/>
<line hits="1" number="176"/>
<line hits="1" number="180"/>
<line hits="1" number="181"/>
<line hits="1" number="184"/>
<line hits="1" number="182"/>
<line hits="1" number="185"/>
<line hits="1" number="186"/>
<line hits="1" number="187"/>
<line hits="1" number="188"/>
<line hits="1" number="189"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="190"/>
<line hits="1" number="191"/>
<line hits="1" number="190"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="191"/>
<line hits="1" number="192"/>
<line hits="1" number="193"/>
<line hits="1" number="196"/>
<line hits="1" number="194"/>
<line hits="1" number="197"/>
<line hits="1" number="210"/>
<line hits="1" number="198"/>
<line hits="1" number="211"/>
<line hits="1" number="228"/>
<line hits="1" number="212"/>
<line hits="1" number="229"/>
<line hits="1" number="230"/>
<line hits="1" number="231"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="232"/>
<line hits="1" number="233"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="234"/>
<line hits="1" number="235"/>
<line hits="1" number="232"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="233"/>
<line hits="1" number="234"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="235"/>
<line hits="1" number="236"/>
<line hits="1" number="239"/>
<line hits="1" number="237"/>
<line hits="1" number="240"/>
<line hits="1" number="241"/>
<line hits="1" number="244"/>
<line hits="1" number="242"/>
<line hits="1" number="245"/>
<line hits="1" number="246"/>
<line hits="1" number="247"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="248"/>
<line hits="1" number="249"/>
<line hits="1" number="248"/>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="249"/>
<line hits="1" number="250"/>
<line hits="1" number="251"/>
<line hits="1" number="252"/>
<line hits="1" number="253"/>
<line hits="1" number="254"/>
<line branch="true" condition-coverage="50% (1/2)" hits="1" missing-branches="exit" number="255"/>
<line hits="1" number="256"/>
<line hits="1" number="255"/>
<line branch="true" condition-coverage="50% (1/2)" hits="1" missing-branches="exit" number="256"/>
<line hits="1" number="257"/>
<line hits="1" number="258"/>
<line hits="1" number="261"/>
<line hits="1" number="259"/>
<line hits="1" number="262"/>
<line hits="1" number="263"/>
<line hits="1" number="264"/>
<line hits="1" number="265"/>
</lines>
</class>
</classes>

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -99,12 +99,13 @@ def __adapt__data__(data, full_path):
# Add time if not exists
if KEY_TIME not in data:
if KEY_YEAR in data and KEY_TRACK in data:
# Use a date where track 1 is the newest in the given year
minute = int(data[KEY_TRACK] / 60)
second = (data[KEY_TRACK] - 60 * minute) % 60
#
data[KEY_TIME] = int(time.mktime((data[KEY_YEAR], 1, 1, 0, 59 - minute, 59 - second, 0, 0, 0)))
data[KEY_TIME_IS_SUBSTITUTION] = True
if data[KEY_YEAR] != 0: # ignore year 0 - must be wrong
# Use a date where track 1 is the newest in the given year
minute = int(data[KEY_TRACK] / 60)
second = (data[KEY_TRACK] - 60 * minute) % 60
#
data[KEY_TIME] = int(time.mktime((data[KEY_YEAR], 1, 1, 0, 59 - minute, 59 - second, 0, 0, 0)))
data[KEY_TIME_IS_SUBSTITUTION] = True
else:
data[KEY_TIME] = int(os.path.getmtime(full_path))
data[KEY_TIME_IS_SUBSTITUTION] = True