Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for "Generate M3U playlist" #245 , along with all reviews required #368

Closed
wants to merge 1 commit into from
Closed

Fixes for "Generate M3U playlist" #245 , along with all reviews required #368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions plugins/playlist/playlist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
# GNU General Public License for more details.

PLUGIN_NAME = "Generate M3U playlist"
PLUGIN_AUTHOR = "Francis Chin, Sambhav Kothari"
PLUGIN_AUTHOR = "Francis Chin, Sambhav Kothari, Sambhav Dixit"
PLUGIN_DESCRIPTION = """Generate an Extended M3U playlist (.m3u8 file, UTF8
encoded text). Relative pathnames are used where audio files are in the same
directory as the playlist, otherwise absolute (full) pathnames are used."""
PLUGIN_VERSION = "1.1.1"
PLUGIN_VERSION = "1.2"
PLUGIN_API_VERSIONS = ["2.0"]
PLUGIN_LICENSE = "GPL-2.0-or-later"
PLUGIN_LICENSE_URL = "https://www.gnu.org/licenses/gpl-2.0.html"
Expand Down Expand Up @@ -67,7 +67,7 @@
b_lines.append(header.encode("utf-8"))
for entry in self.entries:
for row in entry:
b_lines.append(row.encode("utf-8"))
b_lines.append(str(row).encode("utf-8"))
with open(encode_filename(self.filename), "wb") as f:
f.writelines(b_lines)

Expand All @@ -76,9 +76,15 @@
NAME = "Generate &Playlist..."

def callback(self, objs):
current_directory = (self.config.persist["current_directory"]
or QtCore.QDir.homePath())
current_directory = find_existing_path(current_directory)
# Find common path of all files to default where to save playlist
files = []
for album in objs:
for track in album.tracks:
if track.linked_files:
files.append(track.linked_files[0].filename)

current_directory = os.path.commonpath(files)

# Default playlist filename set as "%albumartist% - %album%.m3u8",
# except where "Various Artists" is suppressed
if _debug_level > 1:
Expand All @@ -97,12 +103,14 @@
if _debug_level > 1:
log.debug("{}: default playlist filename sanitized to {}".format(
PLUGIN_NAME, default_filename))
filename, selected_format = QtWidgets.QFileDialog.getSaveFileName(

Check notice on line 106 in plugins/playlist/playlist.py

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

plugins/playlist/playlist.py#L106 

Trailing whitespace
b_filename, selected_format = QtWidgets.QFileDialog.getSaveFileName(

Check warning on line 107 in plugins/playlist/playlist.py

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

plugins/playlist/playlist.py#L107 

Unused variable 'selected_format'
None, "Save new playlist",
os.path.join(current_directory, default_filename),
"Playlist (*.m3u8 *.m3u)"
)
if filename:
if b_filename:
filename = str(b_filename)
playlist = Playlist(filename)
playlist.add_header("#EXTM3U")

Expand Down Expand Up @@ -133,8 +141,8 @@
if _debug_level > 1:
log.debug("{}: audio_filename: {}, selected dir: {}".format(
PLUGIN_NAME, audio_filename, os.path.dirname(filename)))
if os.path.dirname(filename) == os.path.dirname(audio_filename):
audio_filename = os.path.basename(audio_filename)

audio_filename = os.path.relpath(audio_filename, os.path.dirname(filename))
entry.add(str(audio_filename))

playlist.write()
Expand Down
Loading