Merge pull request #170 from pettarin/devel

readbeyond · web-flow · commit 66948d91dfa0 · 2017-03-16T13:48:21.000+01:00
Added regression test for issue #168. Added -f/--full to read_audio
diff --git a/aeneas/audiofile.py b/aeneas/audiofile.py
@@ -209,9 +209,12 @@ def __init__(self, file_path=None, file_format=None, rconf=None, logger=None):
         self.__samples = None
 
     def __unicode__(self):
+        fmt = self.file_format
+        if isinstance(fmt, tuple):
+            fmt = u"%s %d %d" % fmt
         msg = [
             u"File path:         %s" % self.file_path,
-            u"File format:       %s" % self.file_format,
+            u"File format:       %s" % fmt,
             u"File size (bytes): %s" % gf.safe_int(self.file_size),
             u"Audio length (s):  %s" % gf.safe_float(self.audio_length),
             u"Audio format:      %s" % self.audio_format,
@@ -644,4 +647,7 @@ def _update_length(self):
         This function fails silently if one of the two is ``None``.
         """
         if (self.audio_sample_rate is not None) and (self.__samples is not None):
+            # NOTE computing TimeValue (... / ...) yields wrong results,
+            #      see issue #168
+            #      self.audio_length = TimeValue(self.__samples_length / self.audio_sample_rate)
             self.audio_length = TimeValue(self.__samples_length) / TimeValue(self.audio_sample_rate)
diff --git a/aeneas/tests/long_test_task_parameters.py b/aeneas/tests/long_test_task_parameters.py
@@ -354,6 +354,14 @@ def test_exec_os_task_file_levels_123(self):
             ("out", "sonnet.json")
         ], 0)
 
+    def test_exec_exact_5600_16000_munparsed_issue_168(self):
+        self.execute([
+            ("in", "../tests/res/audioformats/exact.5600.16000.wav"),
+            ("in", "../tests/res/inputtext/exact.5600.16000.munparsed.xhtml"),
+            ("", "task_language=eng|is_text_type=munparsed|os_task_file_format=json|is_text_munparsed_l1_id_regex=p[0-9]+|is_text_munparsed_l2_id_regex=p[0-9]+s[0-9]+|is_text_munparsed_l3_id_regex=p[0-9]+s[0-9]+w[0-9]+"),
+            ("out", "sonnet.json")
+        ], 0)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/aeneas/tests/res/audioformats/exact.5600.16000.wav b/aeneas/tests/res/audioformats/exact.5600.16000.wav
diff --git a/aeneas/tests/res/inputtext/exact.5600.16000.munparsed.xhtml b/aeneas/tests/res/inputtext/exact.5600.16000.munparsed.xhtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" lang="en" xml:lang="en">
+ <head>
+  <meta charset="utf-8"/>
+  <meta name="viewport" content="width=768,height=1024"/>
+  <link rel="stylesheet" href="../Styles/style.css" type="text/css"/>
+  <title>Sonnet I</title>
+ </head>
+ <body>
+  <div id="divSonnet">
+   <p class="stanza" id="p000002">
+    <span id="p000002s000001">
+     <span id="p000002s000001w000000">1</span>
+     <span id="p000002s000001w000001">From</span>
+     <span id="p000002s000001w000002">fairest</span>
+     <span id="p000002s000001w000003">creatures</span>
+     <span id="p000002s000001w000004">we</span>
+     <span id="p000002s000001w000005">desire</span>
+     <span id="p000002s000001w000006">increase,</span>
+     <span id="p000002s000001w000007">That</span>
+     <span id="p000002s000001w000008">thereby</span>
+     <span id="p000002s000001w000009">beauty’s</span>
+     <span id="p000002s000001w000010">rose</span>
+     <span id="p000002s000001w000011">might</span>
+     <span id="p000002s000001w000012">never</span>
+     <span id="p000002s000001w000013">die,</span>
+    </span>
+   </p>
+  </div>
+ </body>
+</html>
+
diff --git a/aeneas/tests/test_audiofile.py b/aeneas/tests/test_audiofile.py
@@ -36,6 +36,7 @@ class TestAudioFile(unittest.TestCase):
     AUDIO_FILE_WAVE = "res/audioformats/mono.16000.wav"
     AUDIO_FILE_EMPTY = "res/audioformats/p001.empty"
     AUDIO_FILE_NOT_WAVE = "res/audioformats/p001.mp3"
+    AUDIO_FILE_EXACT = "res/audioformats/exact.5600.16000.wav"
     NOT_EXISTING_FILE = "res/audioformats/x/y/z/not_existing.wav"
     FILES = [
         {
@@ -163,6 +164,11 @@ def test_length(self):
         audiofile.clear_data()
         self.assertAlmostEqual(audiofile.audio_length, TimeValue("53.3"), places=1)     # 53.266
 
+    def test_length_exact(self):
+        audiofile = self.load(self.AUDIO_FILE_EXACT, rs=True)
+        audiofile.clear_data()
+        self.assertAlmostEqual(audiofile.audio_length, TimeValue("5.600"), places=3)     # 5.600
+
     def test_add_samples_file(self):
         audiofile = self.load(self.AUDIO_FILE_WAVE, rs=True)
         data = audiofile.audio_samples
diff --git a/aeneas/tests/tool_test_read_audio.py b/aeneas/tests/tool_test_read_audio.py
@@ -56,11 +56,23 @@ def test_read_audio(self):
             ("in", "../tools/res/audio.wav")
         ], 0)
 
+    def test_read_audio_full(self):
+        self.execute([
+            ("in", "../tools/res/audio.wav"),
+            ("", "-f")
+        ], 0)
+
     def test_read_audio_mp3(self):
         self.execute([
             ("in", "../tools/res/audio.mp3")
         ], 0)
 
+    def test_read_audio_mp3_full(self):
+        self.execute([
+            ("in", "../tools/res/audio.mp3"),
+            ("", "-f")
+        ], 0)
+
     def test_read_audio_path(self):
         path = os.path.expanduser("~")
         path = os.path.join(path, ".bin/myffprobe")
diff --git a/aeneas/tools/read_audio.py b/aeneas/tools/read_audio.py
@@ -51,6 +51,7 @@ class ReadAudioCLI(AbstractCLIProgram):
             (u"AUDIO_FILE", True)
         ],
         "options": [
+            u"-f, --full : load samples from file, possibly converting to WAVE"
         ],
         "parameters": [
         ],
@@ -72,6 +73,8 @@ def perform_command(self):
         try:
             audiofile = AudioFile(audio_file_path, rconf=self.rconf, logger=self.logger)
             audiofile.read_properties()
+            if self.has_option([u"-f", u"--full"]):
+                audiofile.read_samples_from_file()
             self.print_generic(audiofile.__unicode__())
             return self.NO_ERROR_EXIT_CODE
         except OSError:
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -4,7 +4,8 @@ Changelog
 v1.7.3 (2017-03-15)
 -------------------
 
-#. Fixed bug #168
+#. Fixed bug #168 and added a regression test for it
+#. Added option ``-f, --full`` to ``aeneas.tools.read_audio`` and tests for it
 
 v1.7.2 (2017-03-03)
 -------------------
