Show status of videos in progress

elan-ev · Sep 25, 2023 · c3def90 · c3def90
1 parent d139d7a
commit c3def90
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/cronjobs/opencast_clear_recycle_bin.php b/cronjobs/opencast_clear_recycle_bin.php
@@ -22,7 +22,7 @@ public function execute($last_result, $parameters = array())
  {
  echo "Deletes all videos that have been marked as trash for at least " . \Config::get()->OPENCAST_CLEAR_RECYCLE_BIN_INTERVAL . " days\n";
 
- $videos = Videos::findBySql("trashed=true AND trashed_timestamp < NOW() - INTERVAL " . \Config::get()->OPENCAST_CLEAR_RECYCLE_BIN_INTERVAL ." DAY");
+ $videos = Videos::findBySql("trashed=true AND state!='running' AND trashed_timestamp < NOW() - INTERVAL " . \Config::get()->OPENCAST_CLEAR_RECYCLE_BIN_INTERVAL ." DAY");
  foreach ($videos as $video) {
  echo "Video #" . $video->id . " (" . $video->title . ") ";
  if ($video->removeVideo()) {

diff --git a/vueapp/components/Videos/Actions/VideoDeletePermanent.vue b/vueapp/components/Videos/Actions/VideoDeletePermanent.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
- <StudipDialog
+ <StudipDialog v-if="event.state !== 'running'"
  :title="$gettext('Aufzeichnung entfernen')"
  :confirmText="$gettext('Akzeptieren')"
  :confirmClass="'accept'"
@@ -14,6 +14,19 @@
  <translate>Möchten Sie die Aufzeichnung wirklich unwiderruflich entfernen?</translate>
  </template>
  </StudipDialog>
+
+ <StudipDialog v-else
+ :title="$gettext('Aufzeichnung entfernen')"
+ :closeText="$gettext('Abbrechen')"
+ :closeClass="'cancel'"
+ height="215"
+ @close="decline"
+ @confirm="removeVideo"
+ >
+ <template v-slot:dialogContent>
+ <translate>Das Video wird zurzeit verarbeitet und kann deshalb nicht unwiderruflich entfernt werden. Versuchen Sie es zu einem späteren Zeitpunkt erneut.</translate>
+ </template>
+ </StudipDialog>
  </div>
 </template>
 

diff --git a/vueapp/components/Videos/VideoCard.vue b/vueapp/components/Videos/VideoCard.vue
@@ -74,7 +74,7 @@
  <Tag v-for="tag in event.tags" v-bind:key="tag.id" :tag="tag.tag" />
  </div>
 
- <div v-if="!videoSortMode && menuItems.length > 0 && event.state != 'running'" class="oc--actions-container">
+ <div v-if="!videoSortMode && menuItems.length > 0" class="oc--actions-container">
  <StudipActionMenu :items="menuItems"
  :collapseAt="menuItems.length > 1"
  @performAction="performAction"
@@ -263,13 +263,15 @@ export default {
 
  if (!this.event?.trashed) {
  if (this.canEdit) {
- menuItems.push({
- id: 1,
- label: this.$gettext('Bearbeiten'),
- icon: 'edit',
- emit: 'performAction',
- emitArguments: 'VideoEdit'
- });
+ if (this.event?.state !== 'running') {
+ menuItems.push({
+ id: 1,
+ label: this.$gettext('Bearbeiten'),
+ icon: 'edit',
+ emit: 'performAction',
+ emitArguments: 'VideoEdit'
+ });
+ }
 
  /*
  menuItems.push({
@@ -308,7 +310,7 @@ export default {
  });
  }
 
- if (this.event?.publication?.annotation_tool) {
+ if (this.event?.publication?.annotation_tool && this.event?.state !== 'running') {
  menuItems.push({
  id: 6,
  label: this.$gettext('Anmerkungen hinzufügen'),
@@ -318,14 +320,16 @@ export default {
  });
  }
 
- menuItems.push({
- id: 7,
- label: this.$gettext('Untertitel hinzufügen'),
- icon: 'accessibility',
- emit: 'performAction',
- emitArguments: 'CaptionUpload'
- });
-
+ if (this.event?.state !== 'running') {
+ menuItems.push({
+ id: 7,
+ label: this.$gettext('Untertitel hinzufügen'),
+ icon: 'accessibility',
+ emit: 'performAction',
+ emitArguments: 'CaptionUpload'
+ });
+ }
+ 
  menuItems.push({
  id: 8,
  label: this.$gettext('Zum Löschen markieren'),
@@ -334,7 +338,7 @@ export default {
  emitArguments: 'VideoDelete'
  });
  }
- if (this.downloadAllowed) {
+ if (this.downloadAllowed && this.event?.state !== 'running') {
  menuItems.push({
  id: 2,
  label: this.$gettext('Medien runterladen'),

diff --git a/vueapp/components/Videos/VideoUpload.vue b/vueapp/components/Videos/VideoUpload.vue
@@ -411,7 +411,8 @@ export default {
  'episode': episode_id,
  'config_id': view.selectedServer.id,
  'title': uploadData.title,
- 'description': uploadData.description
+ 'description': uploadData.description,
+ 'state': 'running'
  })
  .then(({ data }) => {
  this.$store.dispatch('addMessage', data.message);