Skip to content

Add option to skip songs that have already been recorded; refactor fi… #31

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

Open
mydalon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option to skip songs that have already been recorded; refactor fi… #31

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
23 changes: 19 additions & 4 deletions spotrec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
_debug_logging = False
_skip_intro = False
_mute_pa_recording_sink = False
_new_songs = False
_output_directory = f"{Path.home()}/{app_name}"
_filename_pattern = "{trackNumber} - {artist} - {title}"
_underscored_filenames = False
Expand All @@ -55,6 +56,7 @@
_shell_executable = "/bin/bash" # Default: "/bin/sh"
_shell_encoding = "utf-8"
_ffmpeg_executable = "ffmpeg" # Example: "/usr/bin/ffmpeg"
_filename_extension = "flac"

# Variables that change during runtime
is_script_paused = False
Expand All @@ -70,7 +72,7 @@ def main():
if not _skip_intro:
print(app_name + " v" + app_version)
print("You should not pause, seek or change volume during recording!")
print("Existing files will be overridden!")
print("Existing files will be overridden! (check option --new-songs if you don't want this)")
print("Use --help as argument to see all options.")
print()
print("Disclaimer:")
Expand Down Expand Up @@ -126,6 +128,7 @@ def handle_command_line():
global _debug_logging
global _skip_intro
global _mute_pa_recording_sink
global _new_songs
global _output_directory
global _filename_pattern
global _underscored_filenames
Expand All @@ -140,6 +143,8 @@ def handle_command_line():
action="store_true", default=_skip_intro)
parser.add_argument("-m", "--mute-recording", help="Mute Spotify on your main output device while recording",
action="store_true", default=_mute_pa_recording_sink)
parser.add_argument("-n", "--new-songs", help="Skip all songs that already exist",
action="store_true", default=_new_songs)
parser.add_argument("-o", "--output-directory", help="Where to save the recordings\n"
"Default: " + _output_directory, default=_output_directory)
parser.add_argument("-p", "--filename-pattern", help="A pattern for the file names of the recordings\n"
Expand All @@ -162,6 +167,8 @@ def handle_command_line():

_mute_pa_recording_sink = args.mute_recording

_new_songs = args.new_songs

_filename_pattern = args.filename_pattern

_output_directory = args.output_directory
Expand Down Expand Up @@ -305,6 +312,14 @@ def run(self):
# Use copy() to not change the list during this method runs
self.parent.stop_old_recording(FFmpeg.instances.copy())

# Do not overwrite existing files
if _new_songs:
filename = os.path.join(_output_directory, self.parent.track) + "." + _filename_extension
if os.path.isfile(filename):
log.info("File exists...skipping song.")
self.parent.send_dbus_cmd("Next")
return

# This is currently the only way to seek to the beginning (let it Play for some seconds, Pause and send Previous)
time.sleep(_playback_time_before_seeking_to_beginning)

Expand Down Expand Up @@ -456,7 +471,7 @@ def record(self, out_dir: str, file: str, metadata_for_file={}):
# Use a dot as filename prefix to hide the file until the recording was successful
self.tmp_file_prefix = "."
self.filename = self.tmp_file_prefix + \
os.path.basename(file) + ".flac"
os.path.basename(file) + "." + _filename_extension

# save this to self because metadata_params is discarded after this function
self.cover_url = metadata_for_file.pop('cover_url')
Expand Down Expand Up @@ -560,9 +575,9 @@ def add_cover_art(self, fullfilepath):
# save the image locally -> could use a temp file here
# but might add option to keep image later
cover_file = fullfilepath.rsplit(
'.flac', 1)[0] # remove the extension
'.' + _filename_extension, 1)[0] # remove the extension
log.debug(f'Saving cover art to {cover_file} + image_ext')
temp_file = cover_file + '_withArtwork.' + 'flac'
temp_file = cover_file + '_withArtwork.' + _filename_extension
if self.cover_url.startswith('file://'):
log.debug(f'[FFmpeg] Cover art is local for {fullfilepath}')
path = self.cover_url[len('file://'):]
Expand Down