Skip to content

Commit d7053ed

Browse files
authored
fix(): Correct inaccurate multimedia object cutting (#25)
* fix(): Correct inaccurate multimedia object cutting * fix(27592): Update ci.yml file
1 parent 16c6416 commit d7053ed

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
php-versions: ['7.4', '8.2']
11+
php-versions: ['8.2']
1212

1313
steps:
1414
- name: Checkout
@@ -18,6 +18,6 @@ jobs:
1818
run: find . -type f -name "*.php" -print0 | xargs -0 -n1 -P8 php -l
1919

2020
- name: PHPCSFixer
21-
uses: docker://oskarstark/php-cs-fixer-ga:3.1.0
21+
uses: docker://teltek/php-cs-fixer-ga
2222
with:
2323
args: --config=.php-cs-fixer.dist.php --diff --dry-run

Controller/DefaultController.php

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public function indexAction(MultimediaObject $multimediaObject): Response
127127
*/
128128
public function cutAction(Request $request, MultimediaObject $originalmmobject)
129129
{
130-
$in = (int) $request->get('in_ms');
131-
$out = (int) $request->get('out_ms');
130+
$in = (float) $request->get('in_ms');
131+
$out = (float) $request->get('out_ms');
132132

133133
$multimediaObject = $this->factoryService->createMultimediaObject(
134134
$originalmmobject->getSeries(),
@@ -139,10 +139,8 @@ public function cutAction(Request $request, MultimediaObject $originalmmobject)
139139
$multimediaObject->setRecordDate($originalmmobject->getRecordDate());
140140

141141
$comments = $request->get('comm');
142-
$comments .= "\n---\n CORTADO DE ".$originalmmobject->getTitle().'('.$originalmmobject->getId().') '.gmdate(
143-
'H:i:s',
144-
$in
145-
).' - '.gmdate('H:i:s', $out);
142+
$comments .= "\n---\n CORTADO DE ".$originalmmobject->getTitle().' ('.$originalmmobject->getId().') '.
143+
$this->formatTime($in).' - '.$this->formatTime($out);
146144
$multimediaObject->setComments($comments);
147145

148146
foreach ($this->pumukitLocales as $lang) {
@@ -207,6 +205,17 @@ public function cutAction(Request $request, MultimediaObject $originalmmobject)
207205
return $this->redirectToRoute('pumukitnewadmin_mms_shortener', ['id' => $multimediaObject->getId()]);
208206
}
209207

208+
public function formatTime($milliseconds)
209+
{
210+
return sprintf(
211+
'%02d:%02d:%02d:%03d',
212+
floor($milliseconds / 3600000),
213+
floor(($milliseconds % 3600000) / 60000),
214+
floor(($milliseconds % 60000) / 1000),
215+
$milliseconds % 1000
216+
);
217+
}
218+
210219
protected function notReadyToCut(MultimediaObject $multimediaObject, ?string $msg = '')
211220
{
212221
$i18nMsg = $this->translator->trans($msg);

0 commit comments

Comments
 (0)