Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Backend - Engine
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
238
Issues
238
List
Boards
Labels
Service Desk
Milestones
Merge Requests
42
Merge Requests
42
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Backend - Engine
Compare Revisions
b29fbf67868a3c699dd0d3116c81e8f14c72837d...0e28a2da183072f260837ae680d2c5e272af30ff
Source
0e28a2da183072f260837ae680d2c5e272af30ff
Select Git revision
...
Target
b29fbf67868a3c699dd0d3116c81e8f14c72837d
Select Git revision
Compare
Commits (2)
(fix): spec tests
· 987a52fb
Marcelo Rivera
authored
1 hour ago
987a52fb
(fix): lint
· 0e28a2da
Marcelo Rivera
authored
1 hour ago
0e28a2da
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
6 deletions
+12
-6
Controllers/api/v1/media.php
Controllers/api/v1/media.php
+1
-1
Core/Media/ClientUpload/Manager.php
Core/Media/ClientUpload/Manager.php
+2
-1
Core/Media/Services/FFMpeg.php
Core/Media/Services/FFMpeg.php
+2
-1
Entities/Video.php
Entities/Video.php
+1
-1
Spec/Core/Media/ClientUpload/ManagerSpec.php
Spec/Core/Media/ClientUpload/ManagerSpec.php
+6
-2
No files found.
Controllers/api/v1/media.php
View file @
0e28a2da
...
...
@@ -43,7 +43,7 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
if
(
isset
(
$pages
[
1
])
&&
$pages
[
1
]
==
'play'
)
{
http_response_code
(
302
);
$res
=
!
empty
(
$_GET
[
'res'
])
&&
in_array
(
$_GET
[
'res'
],
[
'360'
,
'720'
,
'1080'
])
?
$_GET
[
'res'
]
:
'360'
;
$res
=
!
empty
(
$_GET
[
'res'
])
&&
in_array
(
$_GET
[
'res'
],
[
'360'
,
'720'
,
'1080'
]
,
true
)
?
$_GET
[
'res'
]
:
'360'
;
if
(
$entity
->
subtype
==
'audio'
)
{
\forward
(
$entity
->
getSourceUrl
(
'128.mp3'
));
...
...
This diff is collapsed.
Click to expand it.
Core/Media/ClientUpload/Manager.php
View file @
0e28a2da
...
...
@@ -29,7 +29,8 @@ class Manager
* @param bool $value
* @return Manager
*/
public
function
setFullHD
(
bool
$value
)
:
Manager
{
public
function
setFullHD
(
bool
$value
)
:
Manager
{
$this
->
full_hd
=
$value
;
return
$this
;
}
...
...
This diff is collapsed.
Click to expand it.
Core/Media/Services/FFMpeg.php
View file @
0e28a2da
...
...
@@ -91,7 +91,8 @@ class FFMpeg implements ServiceInterface
* @param bool $value
* @return FFMpeg
*/
public
function
setFullHD
(
bool
$value
)
{
public
function
setFullHD
(
bool
$value
)
{
$this
->
full_hd
=
$value
;
return
$this
;
}
...
...
This diff is collapsed.
Click to expand it.
Entities/Video.php
View file @
0e28a2da
...
...
@@ -218,7 +218,7 @@ class Video extends Object
if
(
$field
==
'access_id'
)
{
$data
[
$field
]
=
(
int
)
$data
[
$field
];
}
elseif
(
in_array
(
$field
,
[
'mature'
,
'full_hd'
]))
{
}
elseif
(
in_array
(
$field
,
[
'mature'
,
'full_hd'
]
,
true
))
{
$this
->
setFlag
(
$field
,
!!
$data
[
$field
]);
continue
;
}
...
...
This diff is collapsed.
Click to expand it.
Spec/Core/Media/ClientUpload/ManagerSpec.php
View file @
0e28a2da
...
...
@@ -58,7 +58,7 @@ class ManagerSpec extends ObjectBehavior
$lease
->
getGuid
()
->
willReturn
(
456
);
$this
->
save
->
setEntity
(
Argument
::
that
(
function
(
$video
)
{
return
$video
->
guid
==
456
&&
$video
->
access_id
==
0
;
...
...
@@ -72,10 +72,14 @@ class ManagerSpec extends ObjectBehavior
$this
->
ffmpeg
->
setKey
(
456
)
->
shouldBeCalled
();
$this
->
ffmpeg
->
setFullHD
(
false
)
->
shouldBeCalled
();
$this
->
ffmpeg
->
transcode
()
->
shouldBeCalled
();
$this
->
complete
(
$lease
)
$this
->
setFullHD
(
false
)
->
complete
(
$lease
)
->
shouldReturn
(
true
);
}
}
This diff is collapsed.
Click to expand it.