Juggling around the .album.jpg ending and trying various movie extensions is no longer needed here - it's all handled in find_by_path.