Not treating images as audio

soundconverter/gstreamer/discoverer.py

@@ -139,10 +139,16 @@ def _analyse_file(self, sound_file):
  for tag, value in sound_file.tags.items():
  logger.debug(' {}: {}'.format(tag, value))
 
+ duration = info.get_duration() / Gst.SECOND
+ if duration == 0:
+ # might be an image
+ return
+
  # since threads share memory, this doesn't have to be sent
  # over a bus or queue, but rather can be written into the
  # sound_file
- sound_file.duration = info.get_duration() / Gst.SECOND
+ sound_file.duration = duration
+
  sound_file.readable = True
  except Exception as error:
  if not isinstance(error, GLib.Error):

tests/testcases/batch.py

@@ -120,6 +120,7 @@ def test_single_dir_depth_input(self):
  'file:https://' + urllib.parse.quote(os.path.realpath('test data/audio/strângë chàrs фズ.wav')),
  'file:https://' + os.path.realpath('test%20data/empty/a'),
  'file:https://' + os.path.realpath('test%20data/empty/b/c'),
+ 'file:https://' + os.path.realpath('test%20data/image.jpg'),
  'file:https://' + os.path.realpath('test%20data/a.iso'),
  'file:https://' + os.path.realpath('test%20data/no%20tags/no-tags.mp3'),
  'file:https://' + os.path.realpath('test%20data/no%20tags/no-tags.ogg'),
@@ -143,6 +144,7 @@ def test_single_dir_depth_input(self):
  'test data/empty/',
  'test data/empty/b/',
  'test data/',
+ 'test data/',
  'test data/no tags/',
  'test data/no tags/',
  'test data/no tags/'
@@ -161,6 +163,7 @@ def test_absolute(self):
  'file:https://' + urllib.parse.quote(os.path.realpath('tests/test data/audio/strângë chàrs фズ.wav')),
  'file:https://' + os.path.realpath('tests/test%20data/empty/a'),
  'file:https://' + os.path.realpath('tests/test%20data/empty/b/c'),
+ 'file:https://' + os.path.realpath('tests/test%20data/image.jpg'),
  'file:https://' + os.path.realpath('tests/test%20data/a.iso'),
  'file:https://' + os.path.realpath('tests/test%20data/no%20tags/no-tags.mp3'),
  'file:https://' + os.path.realpath('tests/test%20data/no%20tags/no-tags.ogg'),
@@ -177,6 +180,7 @@ def test_absolute(self):
  'test data/empty/',
  'test data/empty/b/',
  'test data/',
+ 'test data/',
  'test data/no tags/',
  'test data/no tags/',
  'test data/no tags/'

tests/testcases/discoverer.py

@@ -147,9 +147,14 @@ def test_read_tags_multiple(self):
  self.assertLess(abs(sound_files[2].duration - 1.00), 0.01)
 
  def test_not_audio(self):
- c_mp3 = 'file:https://' + os.path.realpath('tests/test%20data/empty/a')
+ empty = 'file:https://' + os.path.realpath('tests/test%20data/empty/a')
  a_iso = 'file:https://' + os.path.realpath('tests/test%20data/a.iso')
- discoverer = Discoverer([SoundFile(c_mp3), SoundFile(a_iso)])
+ image_jpg = 'file:https://' + os.path.realpath('tests/test%20data/image.jpg')
+ discoverer = Discoverer([
+ SoundFile(empty),
+ SoundFile(a_iso),
+ SoundFile(image_jpg)
+ ])
  discoverer.set_callback(lambda _: None)
  discoverer.run()
 
@@ -164,16 +169,13 @@ def test_not_audio(self):
 
  done.assert_called_with(discoverer)
 
- sound_file = discoverer.sound_files[0]
- self.assertIsNone(sound_file.duration)
- self.assertFalse(sound_file.readable)
- self.assertEqual(len(sound_file.tags), 0)
-
- sound_file = discoverer.sound_files[1]
- self.assertEqual(is_denylisted(sound_file), '*.iso')
- self.assertIsNone(sound_file.duration)
- self.assertFalse(sound_file.readable)
- self.assertEqual(len(sound_file.tags), 0)
+ self.assertEqual(len(discoverer.sound_files), 3)
+ for sound_file in discoverer.sound_files:
+ self.assertFalse(sound_file.readable)
+ self.assertIsNone(sound_file.duration)
+ self.assertEqual(len(sound_file.tags), 0)
+
+ self.assertEqual(is_denylisted(discoverer.sound_files[1]), '*.iso')
 
 
 if __name__ == "__main__":