gergely/git-sound
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make progress bar more accurate when generating MIDI beats

Browse Source
This commit is contained in:
Gergely Polonkai 2016-06-09 22:16:07 +02:00
parent 1212d63312
commit c70322bdf0
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
git-sound.py
View File

@ -296,9 +296,9 @@ class GitSoundWindow(object):
notelen = self.notelen_spin.get_value() notelen = self.notelen_spin.get_value()
beatlen = int(self.beatlen_spin.get_value()) or None beatlen = int(self.beatlen_spin.get_value()) or None
self.set_status("Generating data")
self.progressbar.set_fraction(0.0) self.progressbar.set_fraction(0.0)
self.progressbar.pulse() self.progressbar.pulse()
self.set_status("Reading commits")
self.gitmidi = GitMIDI(repository=repo_path, self.gitmidi = GitMIDI(repository=repo_path,
branch=branch_selected, branch=branch_selected,
verbose=False, verbose=False,
@ -309,25 +309,30 @@ class GitSoundWindow(object):
note_duration=notelen, note_duration=notelen,
max_beat_len=beatlen) max_beat_len=beatlen)
self.set_status("Generating beats")
self.gitmidi.gen_repo_data(callback=self.genrepo_cb) self.gitmidi.gen_repo_data(callback=self.genrepo_cb)
self.set_status("Generating MIDI")
self.gitmidi.generate_midi(callback=self.genrepo_cb) self.gitmidi.generate_midi(callback=self.genrepo_cb)
self.gitmidi.write_mem() self.gitmidi.write_mem()
self.set_buttons_sensitivity(disable_all=False) self.set_buttons_sensitivity(disable_all=False)
def genrepo_cb(self, max_count=None, current=None): def genrepo_cb(self, max_count, current):
""" """
Generate repository data. This is called when the user presses Generate repository data. This is called when the user presses
the Generate button. the Generate button.
""" """
if max_count is None or current is None: if max_count is None or current is None:
self.progressbar.pulse() self.progressbar.pulse()
else: else:
self.progressbar.set_fraction(current / max_count) fraction = float(current) / float(max_count)
self.progressbar.set_fraction(fraction)
# Make sure the progress bar gets updated # Make sure the progress bar gets updated
Gtk.main_iteration_do(False) Gtk.main_iteration_do(False)
Gtk.main_iteration_do(False)
def update_play_pos(self): def update_play_pos(self):
""" """
@ -514,7 +519,7 @@ class GitMIDI(MIDIFile):
return self.__scale[note_num] return self.__scale[note_num]
def gen_beat(self, commit, callback=None): def gen_beat(self, commit):
""" """
Generate data for a beat based on a commit and its files. Generate data for a beat based on a commit and its files.
""" """
@ -530,9 +535,6 @@ class GitMIDI(MIDIFile):
if file_count > self.__max_beat_len: if file_count > self.__max_beat_len:
break break
if callback is not None:
callback(max_count=None, current=None)
volume_mod = self.__program['file'].get('volume', 0) volume_mod = self.__program['file'].get('volume', 0)
file_note = self.sha_to_note(get_file_sha(commit, file_name)) + \ file_note = self.sha_to_note(get_file_sha(commit, file_name)) + \
self.__program['file']['octave'] * 12 self.__program['file']['octave'] * 12
@ -545,9 +547,6 @@ class GitMIDI(MIDIFile):
'volume': file_volume, 'volume': file_volume,
}) })
if callback is not None:
callback(max_count=None, current=None)
volume_mod = self.__program['commit'].get('volume', 0) volume_mod = self.__program['commit'].get('volume', 0)
commit_note = self.sha_to_note(commit.hexsha) + \ commit_note = self.sha_to_note(commit.hexsha) + \
@ -589,7 +588,7 @@ class GitMIDI(MIDIFile):
current_commit = to_process.pop() current_commit = to_process.pop()
if callback is not None: if callback is not None:
callback(max_count=None, current=None) callback(None, None)
if current_commit not in self.__repo_data: if current_commit not in self.__repo_data:
self.__repo_data.append(current_commit) self.__repo_data.append(current_commit)
@ -604,8 +603,17 @@ class GitMIDI(MIDIFile):
if self.__verbose: if self.__verbose:
print("Generating MIDI data…") print("Generating MIDI data…")
self.__git_log = [self.gen_beat(commit, callback=callback) self.__git_log = []
for commit in self.__repo_data[self.__skip:]] current_commit = 0
commits_to_process = self.__repo_data[self.__skip:]
commit_count = len(commits_to_process)
for commit in commits_to_process:
if callback:
current_commit += 1
callback(commit_count, current_commit)
self.__git_log.append(self.gen_beat(commit))
@property @property
def repo_data(self): def repo_data(self):
@ -660,7 +668,7 @@ class GitMIDI(MIDIFile):
section_len = len(section['file_notes']) * self.__note_duration section_len = len(section['file_notes']) * self.__note_duration
if callback is not None: if callback is not None:
callback(max_count=log_length, current=current) callback(log_length, current)
# Add a long note # Add a long note
if self.__need_commits: if self.__need_commits: