From 5fcc52198a6b4a7c2d55a51fd4419877e5263843 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 21 Feb 2019 16:28:09 +0100 Subject: [PATCH] Update kdenlive session parsing against kdenlive 0.9.10 --- debian/rules | 0 example/sandbox/diag.sh | 0 example/sandbox/manage.py | 0 example/sandbox/update_schema.sh | 0 .../telemeta/images/feed-icon-14x14.png | Bin .../telemeta/images/feed-icon-28x28.png | Bin .../telemeta/images/player_controlbg.png | Bin telemeta/util/kdenlive/auto_fade.py | 0 telemeta/util/kdenlive/auto_fade_batch.py | 0 telemeta/util/kdenlive/mlt_fix_threads.sh | 0 telemeta/util/kdenlive/mlt_process_batch.py | 0 telemeta/util/kdenlive/session.py | 49 +++++++++--------- tools/dev/fix_svn_authors.sh | 0 tools/dev/make_doc.sh | 0 tools/dev/merge_master_all.sh | 0 tools/dev/merge_master_to.sh | 0 tools/dev/push.sh | 0 tools/dev/pypi.sh | 0 tools/dev/translate.sh | 0 .../eztelemetaitem/eztelemetaitemtype.php | 0 .../templates/embed/eztelemetaitem.tpl | 0 .../templates/full/eztelemetaitem.tpl | 0 .../content/datatype/edit/eztelemetaitem.tpl | 0 .../content/datatype/view/eztelemetaitem.tpl | 0 tools/eztelemeta/doc/README.fr.in | 0 tools/eztelemeta/settings/override.ini.append | 0 .../translations/fre-FR/translation.ts | 0 tools/scripts/crem_checker.py | 0 tools/scripts/process-waveform-cgi.py | 0 tools/scripts/telemeta-backup.py | 0 tools/scripts/telemeta-crem-import-alt_ids.py | 0 tools/scripts/telemeta-crem-import-test.py | 0 tools/scripts/telemeta-crem-import.py | 0 tools/scripts/telemeta-media-link.py | 0 tools/scripts/transcode/create_thumbs.py | 0 tools/scripts/transcode/remux_fix_media.py | 0 tools/scripts/transcode/transcode.py | 0 37 files changed, 24 insertions(+), 25 deletions(-) mode change 100755 => 100644 debian/rules mode change 100755 => 100644 example/sandbox/diag.sh mode change 100755 => 100644 example/sandbox/manage.py mode change 100755 => 100644 example/sandbox/update_schema.sh mode change 100755 => 100644 telemeta/static/telemeta/images/feed-icon-14x14.png mode change 100755 => 100644 telemeta/static/telemeta/images/feed-icon-28x28.png mode change 100755 => 100644 telemeta/static/telemeta/images/player_controlbg.png mode change 100755 => 100644 telemeta/util/kdenlive/auto_fade.py mode change 100755 => 100644 telemeta/util/kdenlive/auto_fade_batch.py mode change 100755 => 100644 telemeta/util/kdenlive/mlt_fix_threads.sh mode change 100755 => 100644 telemeta/util/kdenlive/mlt_process_batch.py mode change 100755 => 100644 tools/dev/fix_svn_authors.sh mode change 100755 => 100644 tools/dev/make_doc.sh mode change 100755 => 100644 tools/dev/merge_master_all.sh mode change 100755 => 100644 tools/dev/merge_master_to.sh mode change 100755 => 100644 tools/dev/push.sh mode change 100755 => 100644 tools/dev/pypi.sh mode change 100755 => 100644 tools/dev/translate.sh mode change 100755 => 100644 tools/eztelemeta/datatypes/eztelemetaitem/eztelemetaitemtype.php mode change 100755 => 100644 tools/eztelemeta/design/standard/override/templates/embed/eztelemetaitem.tpl mode change 100755 => 100644 tools/eztelemeta/design/standard/override/templates/full/eztelemetaitem.tpl mode change 100755 => 100644 tools/eztelemeta/design/standard/templates/content/datatype/edit/eztelemetaitem.tpl mode change 100755 => 100644 tools/eztelemeta/design/standard/templates/content/datatype/view/eztelemetaitem.tpl mode change 100755 => 100644 tools/eztelemeta/doc/README.fr.in mode change 100755 => 100644 tools/eztelemeta/settings/override.ini.append mode change 100755 => 100644 tools/eztelemeta/translations/fre-FR/translation.ts mode change 100755 => 100644 tools/scripts/crem_checker.py mode change 100755 => 100644 tools/scripts/process-waveform-cgi.py mode change 100755 => 100644 tools/scripts/telemeta-backup.py mode change 100755 => 100644 tools/scripts/telemeta-crem-import-alt_ids.py mode change 100755 => 100644 tools/scripts/telemeta-crem-import-test.py mode change 100755 => 100644 tools/scripts/telemeta-crem-import.py mode change 100755 => 100644 tools/scripts/telemeta-media-link.py mode change 100755 => 100644 tools/scripts/transcode/create_thumbs.py mode change 100755 => 100644 tools/scripts/transcode/remux_fix_media.py mode change 100755 => 100644 tools/scripts/transcode/transcode.py diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 diff --git a/example/sandbox/diag.sh b/example/sandbox/diag.sh old mode 100755 new mode 100644 diff --git a/example/sandbox/manage.py b/example/sandbox/manage.py old mode 100755 new mode 100644 diff --git a/example/sandbox/update_schema.sh b/example/sandbox/update_schema.sh old mode 100755 new mode 100644 diff --git a/telemeta/static/telemeta/images/feed-icon-14x14.png b/telemeta/static/telemeta/images/feed-icon-14x14.png old mode 100755 new mode 100644 diff --git a/telemeta/static/telemeta/images/feed-icon-28x28.png b/telemeta/static/telemeta/images/feed-icon-28x28.png old mode 100755 new mode 100644 diff --git a/telemeta/static/telemeta/images/player_controlbg.png b/telemeta/static/telemeta/images/player_controlbg.png old mode 100755 new mode 100644 diff --git a/telemeta/util/kdenlive/auto_fade.py b/telemeta/util/kdenlive/auto_fade.py old mode 100755 new mode 100644 diff --git a/telemeta/util/kdenlive/auto_fade_batch.py b/telemeta/util/kdenlive/auto_fade_batch.py old mode 100755 new mode 100644 diff --git a/telemeta/util/kdenlive/mlt_fix_threads.sh b/telemeta/util/kdenlive/mlt_fix_threads.sh old mode 100755 new mode 100644 diff --git a/telemeta/util/kdenlive/mlt_process_batch.py b/telemeta/util/kdenlive/mlt_process_batch.py old mode 100755 new mode 100644 diff --git a/telemeta/util/kdenlive/session.py b/telemeta/util/kdenlive/session.py index 74eb4258..d4ed3c63 100644 --- a/telemeta/util/kdenlive/session.py +++ b/telemeta/util/kdenlive/session.py @@ -65,7 +65,8 @@ class KDEnLiveSession(object): return sorted(self.entries(), key=lambda k: int(k['in']), reverse=False) def entries_video_seconds(self): - fps = float(self.profile()['frame_rate_num']) + fps = float(self.profile()['frame_rate_num'])/1000 + #fps= 25 list = [] entries = self.video_entries() for i in range(0,len(entries)): @@ -123,30 +124,28 @@ class KDEnLiveSession(object): entries = self.entries_video_seconds() for attr in self.session['children']: - if 'kdenlivedoc' in attr['name']: - + if 'playlist' in attr['name']: for att in attr['children']: - if 'markers' in att['name'] and 'children' in att.keys(): - - for at in att['children']: - if 'marker' in at['name']: - - marker_time = float(at['attributes']['time'].replace(',','.')) - id = at['attributes']['id'] - rel_time = 0 - - for entry in entries: - if marker_time >= entry['in'] and marker_time <= entry['out'] and id == entry['id']: - if i == 0 and from_first_marker: - abs_time = entry['t'] - rel_time = entry['t'] + (marker_time - entry['in']) - abs_time + offset - break - - at['attributes']['time'] = rel_time - at['attributes']['session_timecode'] = time.strftime('%H:%M:%S', time.gmtime(rel_time)) - at['attributes']['comment'] = self.fix_text(at['attributes']['comment']) - markers.append(at['attributes']) - - i += 1 + marker = {} + if 'name' in att['attributes']: + name = att['attributes']['name'] + if 'marker' in name: + marker_time = float(name.split(':')[-1].replace(',','.').replace(' ', '')) + id = name.split(':')[-2].split('.')[-1] + rel_time = 0 + + for entry in entries: + if marker_time >= entry['in'] and marker_time <= entry['out'] and id == entry['id']: + if i == 0 and from_first_marker: + abs_time = entry['t'] + rel_time = entry['t'] + (marker_time - entry['in']) - abs_time + offset + break + + marker['time'] = rel_time + marker['session_timecode'] = time.strftime('%H:%M:%S', time.gmtime(rel_time)) + marker['comment'] = self.fix_text(att['cdata']) + markers.append(marker) + + i += 1 return markers diff --git a/tools/dev/fix_svn_authors.sh b/tools/dev/fix_svn_authors.sh old mode 100755 new mode 100644 diff --git a/tools/dev/make_doc.sh b/tools/dev/make_doc.sh old mode 100755 new mode 100644 diff --git a/tools/dev/merge_master_all.sh b/tools/dev/merge_master_all.sh old mode 100755 new mode 100644 diff --git a/tools/dev/merge_master_to.sh b/tools/dev/merge_master_to.sh old mode 100755 new mode 100644 diff --git a/tools/dev/push.sh b/tools/dev/push.sh old mode 100755 new mode 100644 diff --git a/tools/dev/pypi.sh b/tools/dev/pypi.sh old mode 100755 new mode 100644 diff --git a/tools/dev/translate.sh b/tools/dev/translate.sh old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/datatypes/eztelemetaitem/eztelemetaitemtype.php b/tools/eztelemeta/datatypes/eztelemetaitem/eztelemetaitemtype.php old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/design/standard/override/templates/embed/eztelemetaitem.tpl b/tools/eztelemeta/design/standard/override/templates/embed/eztelemetaitem.tpl old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/design/standard/override/templates/full/eztelemetaitem.tpl b/tools/eztelemeta/design/standard/override/templates/full/eztelemetaitem.tpl old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/design/standard/templates/content/datatype/edit/eztelemetaitem.tpl b/tools/eztelemeta/design/standard/templates/content/datatype/edit/eztelemetaitem.tpl old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/design/standard/templates/content/datatype/view/eztelemetaitem.tpl b/tools/eztelemeta/design/standard/templates/content/datatype/view/eztelemetaitem.tpl old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/doc/README.fr.in b/tools/eztelemeta/doc/README.fr.in old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/settings/override.ini.append b/tools/eztelemeta/settings/override.ini.append old mode 100755 new mode 100644 diff --git a/tools/eztelemeta/translations/fre-FR/translation.ts b/tools/eztelemeta/translations/fre-FR/translation.ts old mode 100755 new mode 100644 diff --git a/tools/scripts/crem_checker.py b/tools/scripts/crem_checker.py old mode 100755 new mode 100644 diff --git a/tools/scripts/process-waveform-cgi.py b/tools/scripts/process-waveform-cgi.py old mode 100755 new mode 100644 diff --git a/tools/scripts/telemeta-backup.py b/tools/scripts/telemeta-backup.py old mode 100755 new mode 100644 diff --git a/tools/scripts/telemeta-crem-import-alt_ids.py b/tools/scripts/telemeta-crem-import-alt_ids.py old mode 100755 new mode 100644 diff --git a/tools/scripts/telemeta-crem-import-test.py b/tools/scripts/telemeta-crem-import-test.py old mode 100755 new mode 100644 diff --git a/tools/scripts/telemeta-crem-import.py b/tools/scripts/telemeta-crem-import.py old mode 100755 new mode 100644 diff --git a/tools/scripts/telemeta-media-link.py b/tools/scripts/telemeta-media-link.py old mode 100755 new mode 100644 diff --git a/tools/scripts/transcode/create_thumbs.py b/tools/scripts/transcode/create_thumbs.py old mode 100755 new mode 100644 diff --git a/tools/scripts/transcode/remux_fix_media.py b/tools/scripts/transcode/remux_fix_media.py old mode 100755 new mode 100644 diff --git a/tools/scripts/transcode/transcode.py b/tools/scripts/transcode/transcode.py old mode 100755 new mode 100644 -- 2.39.5