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

Add -c flag to count the track number in a 3digit wide playlist order #13

Merged
merged 7 commits into from
Feb 17, 2021
Merged

Add -c flag to count the track number in a 3digit wide playlist order #13

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dde9d3a
Add -a cli flag to put recorded files into folders
thescooby Feb 6, 2021
6b0dab4
Add -c cli flag to add a 3digit playlist counter as prefix like 0xx_*…
thescooby Feb 6, 2021
feb2324
Move playlist counter increase to stop_blocking() to prevent too many…
thescooby Feb 17, 2021
7fe1785
Change description of '-c'
thescooby Feb 17, 2021
0cd99ea
Replace pl_track_counter with intern_track_counter
thescooby Feb 17, 2021
b59222a
Replace pl_track_counter with internal_track_counter
thescooby Feb 17, 2021
c0d1b88
Fix glibloop assignment
thescooby Feb 17, 2021
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
48 changes: 36 additions & 12 deletions spotrec.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
_filename_pattern = "{trackNumber} - {artist} - {title}"
_tmp_file = True
_underscored_filenames = False
_use_internal_track_counter = False

# Hard-coded settings
_pa_recording_sink_name = "spotrec"
Expand All @@ -54,6 +55,7 @@
is_script_paused = False
is_first_playing = True
pa_spotify_sink_input_id = -1
internal_track_counter = 1


def main():
Expand Down Expand Up @@ -122,6 +124,7 @@ def handle_command_line():
global _filename_pattern
global _tmp_file
global _underscored_filenames
global _use_internal_track_counter

#parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser = argparse.ArgumentParser(
Expand All @@ -141,6 +144,7 @@ def handle_command_line():
action="store_true", default=not _tmp_file)
parser.add_argument("-u", "--underscored-filenames", help="Force the file names to have underscores instead of whitespaces",
action="store_true", default=_underscored_filenames)
parser.add_argument("-c", "--internal-track-counter", help="Replace Spotify's tracknumber with own counter. Useable for preserving a playlist file order.", action="store_true", default=_use_internal_track_counter)

args = parser.parse_args()

Expand All @@ -158,6 +162,7 @@ def handle_command_line():

_underscored_filenames = args.underscored_filenames

_use_internal_track_counter = args.internal_track_counter

def init_log():
global log
Expand All @@ -184,6 +189,8 @@ class Spotify:
playbackstatus_paused = "Paused"

def __init__(self):
self.glibloop = None

dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)

try:
Expand Down Expand Up @@ -224,7 +231,7 @@ def run(self):

log.info(f"[{app_name}] Spotify DBus listener started")

log.info(f"[{app_name}] Current song: " + self.track)
log.info(f"[{app_name}] Current song: " + self.track + " from the album " + self.metadata_album)
log.info(f"[{app_name}] Current state: " + self.playbackstatus)

# TODO: this is a dirty solution (uses cmdline instead of python for now)
Expand All @@ -250,10 +257,10 @@ def get_track(self, metadata):
filename_pattern = re.sub(" - ", "__", _filename_pattern)
else:
filename_pattern = _filename_pattern

ret = str(filename_pattern.format(
artist=self.metadata_artist,
album=self.metadata_artist,
album=self.metadata_album,
thescooby marked this conversation as resolved.
Show resolved Hide resolved
trackNumber=self.metadata_trackNumber,
title=self.metadata_title
))
Expand Down Expand Up @@ -352,7 +359,7 @@ def on_playing_uri_changed(self, Player, three, four):
# Update Metadata
self.update_metadata()

# Update track & trackid
# Update track & trackid

self.trackid2 = self.metadata.get(dbus.String(u'mpris:trackid'))
if self.trackid != self.trackid2:
Expand Down Expand Up @@ -383,14 +390,19 @@ def playbackstatus_changed(self):
self.init_pa_stuff_if_needed()

def update_metadata(self):
global internal_track_counter

self.metadata = self.iface.Get(self.mpris_player_string, "Metadata")

self.metadata_artist = ", ".join(
self.metadata.get(dbus.String(u'xesam:artist')))
self.metadata_album = self.metadata.get(dbus.String(u'xesam:album'))
self.metadata_title = self.metadata.get(dbus.String(u'xesam:title'))
self.metadata_trackNumber = str(self.metadata.get(
dbus.String(u'xesam:trackNumber'))).zfill(2)
self.metadata_title = self.metadata.get(dbus.String(u'xesam:title'))
if _use_internal_track_counter:
self.metadata_trackNumber = str(internal_track_counter).zfill(3)


def init_pa_stuff_if_needed(self):
if self.is_playing():
Expand All @@ -409,27 +421,33 @@ class FFmpeg:
instances = []

def record(self, filename, metadata_for_file={}):
global _output_directory

self.pulse_input = _pa_recording_sink_name + ".monitor"

if _tmp_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 + filename + ".flac"
self.filename = self.tmp_file_prefix + os.path.basename(filename) + ".flac"
else:
self.filename = filename + ".flac"
# Fix for filenames containing '/'
self.filename = self.filename.replace("/", "_")
self.filename = os.path.basename(filename) + ".flac"

# build metadata param
metadata_params = ''
for key, value in metadata_for_file.items():
metadata_params += ' -metadata ' + key + '=' + shlex.quote(value)

# If output folder is not available then create it
# If filename_pattern specifies a subfolder path the track name is only the basename the rest is a subfolder path
self.outsubdir = os.path.dirname(filename)
Path(os.path.join(_output_directory, self.outsubdir)).mkdir(parents=True, exist_ok=True)

# FFmpeg Options:
# "-hide_banner": to short the debug log a little
# "-y": to overwrite existing files
self.process = Shell.Popen(_ffmpeg_executable + ' -hide_banner -y -f pulse -ac 2 -ar 44100 -i ' +
self.pulse_input + metadata_params + ' -acodec flac ' + shlex.quote(_output_directory + "/" + self.filename))
self.pulse_input + metadata_params + ' -acodec flac ' +
shlex.quote(os.path.join(_output_directory, self.outsubdir, self.filename)))

self.pid = str(self.process.pid)

Expand All @@ -439,6 +457,8 @@ def record(self, filename, metadata_for_file={}):

# The blocking version of this method waits until the process is dead
def stop_blocking(self):
global internal_track_counter

# Remove from instances list (and terminate)
if self in self.instances:
self.instances.remove(self)
Expand All @@ -459,8 +479,8 @@ def stop_blocking(self):
log.info(f"[FFmpeg] [{self.pid}] killed")
else:
if _tmp_file:
tmp_file = os.path.join(_output_directory, self.filename)
new_file = os.path.join(_output_directory,
tmp_file = os.path.join(_output_directory, self.outsubdir, self.filename)
new_file = os.path.join(_output_directory, self.outsubdir,
self.filename[len(self.tmp_file_prefix):])
if os.path.exists(tmp_file):
shutil.move(tmp_file, new_file)
Expand All @@ -473,6 +493,10 @@ def stop_blocking(self):
# Remove process from memory (and don't left a ffmpeg 'zombie' process)
self.process = None

# Update playlist counter here to get rid of too many triggers for counting
if _use_internal_track_counter:
internal_track_counter += 1

# Kill the process in the background
def stop(self):
class KillThread(Thread):
Expand Down