From 72075dde5d105e830a039564df87091ca8923d1b Mon Sep 17 00:00:00 2001 From: Fabrice Laporte Date: Tue, 2 Jun 2015 22:12:00 +0200 Subject: [PATCH 1/2] fix #1490 don't overwrite basename argument --- beetsplug/importfeeds.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/beetsplug/importfeeds.py b/beetsplug/importfeeds.py index b1e76d9a8..6b0a46778 100644 --- a/beetsplug/importfeeds.py +++ b/beetsplug/importfeeds.py @@ -118,10 +118,9 @@ class ImportFeedsPlugin(BeetsPlugin): paths.append(relpath) if 'm3u' in formats: - basename = bytestring_path( - self.config['m3u_name'].get(unicode) - ) - m3u_path = os.path.join(feedsdir, basename) + m3u_basename = bytestring_path( + self.config['m3u_name'].get(unicode)) + m3u_path = os.path.join(feedsdir, m3u_basename) _write_m3u(m3u_path, paths) if 'm3u_multi' in formats: From 2da6da17683eb156c96d8dc5830e3f3fe1e4baa1 Mon Sep 17 00:00:00 2001 From: Fabrice Laporte Date: Tue, 2 Jun 2015 23:45:08 +0200 Subject: [PATCH 2/2] update docs --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 0ec2e53fb..5077d1fe0 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -22,6 +22,8 @@ New features: Fixes: +* :doc:`/plugins/importfeeds`: Avoid generating incorrect m3u filename when + both `m3u` and `m3u_multi` options are `True`. :bug:`1490` * :doc:`/plugins/duplicates`: Avoid a crash when misconfigured. :bug:`1457` * :doc:`/plugins/mpdstats`: Avoid a crash when the music played is not in the beets library. Thanks to :user:`CodyReichert`. :bug:`1443`