Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #56 #91

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #56 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5655a2
Fix #56
skl256 Aug 7, 2023
ece68ac
Add selection auido codec, fix error message
skl256 Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.0.6-fix-issue-56

- Fix convert to same format (e.g. .mp4 to .mp4)
[issues/56](https://github.com/PaulLereverend/NextcloudVideo_Converter/issues/56)

## 1.0.6

- Support for NC 27
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* More formats will be added soon

]]></description>
<version>1.0.6</version>
<version>1.0.6-fix-issue-56</version>
<licence>agpl</licence>
<author mail="paulereverend@gmail.com">Paul Lereverend</author>
<namespace>Video_converter</namespace>
Expand Down
178 changes: 97 additions & 81 deletions js/conversion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ $(document).ready(function () {
var priority = "0";
var title = "Titre";
var vcodec = null;
var acodec = null;
var vbitrate = null;
var scaling = null;
var faststart = true;
Expand Down Expand Up @@ -66,7 +67,7 @@ $(document).ready(function () {
+ '<option value="10" selected>Low</option>'
+ '</select>'
+ '<br>'
+ '<p class="vc-label urldisplay" id="labelCodec" style="display:inline-block; margin-right:5px;">'
+ '<p class="vc-label urldisplay" id="labelCodecV" style="display:inline-block; margin-right:5px;">'
+ 'Codec'
+ '</p>'
+ '<select id="vcodec" style="margin-bottom: 10px;">'
Expand All @@ -92,6 +93,15 @@ $(document).ready(function () {
+ 'kbit/s'
+ '</p>'
+ '<br>'
+ '<p class="vc-label urldisplay" id="labelCodecA" style="display:inline-block; margin-right:5px;">'
+ 'Codec Audio'
+ '</p>'
+ '<select id="acodec" style="margin-bottom: 10px;">'
+ '<option value="none">Auto</option>'
+ '<option value="aac">AAC</option>'
+ '<option value="an">No audio</option>'
+ '</select>'
+ '<br>'
+ '<p class="vc-label urldisplay" id="labelScale" style="display:inline-block; margin-right:5px;">'
+ 'Scale to'
+ '</p>'
Expand Down Expand Up @@ -142,6 +152,13 @@ $(document).ready(function () {
if (vcodec === "none") {
vcodec = null;
}
});
document.getElementById("acodec").addEventListener("change", function (element) {
console.log(element.srcElement.value);
acodec = element.srcElement.value;
if (acodec === "none") {
acodec = null;
}
});
document.getElementById("vbitrate").addEventListener("change", function (element) {
vbitrate = element.srcElement.value;
Expand All @@ -165,86 +182,85 @@ $(document).ready(function () {
var fileExt = filename.split('.').pop();
var types = ['avi', 'mp4', 'm4v', 'webm'];
types.forEach(type => {
if (type == fileExt) {
document.getElementById(type).setAttribute('style', 'background-color: lightgray; border-color:lightgray;');
} else {
document.getElementById(type).addEventListener("click", function ($element) {
if (context.fileInfoModel.attributes.mountType == "external") {
var data = {
nameOfFile: filename,
directory: context.dir,
external: 1,
type: $element.target.id,
preset: preset,
priority: priority,
movflags: faststart,
codec: vcodec,
vbitrate: vbitrate,
scale: scaling,
mtime: context.fileInfoModel.attributes.mtime,
};
} else {
var data = {
nameOfFile: filename,
directory: context.dir,
external: 0,
type: $element.target.id,
preset: preset,
priority: priority,
movflags: faststart,
codec: vcodec,
vbitrate: vbitrate,
scale: scaling,
shareOwner: context.fileList.dirInfo.shareOwnerId,
};
}
var tr = context.fileList.findFileEl(filename);
context.fileList.showFileBusyState(tr, true);
$.ajax({
type: "POST",
async: "true",
url: OC.filePath('video_converter', 'ajax', 'convertHere.php'),
data: data,
beforeSend: function () {
document.getElementById("loading").style.display = "block";
document.getElementById("noteLoading").style.display = "block";
document.getElementById("params").style.display = "none";
document.getElementById("text").style.display = "none";
document.getElementById("preset").style.display = "none";
document.getElementById("vcodec").style.display = "none";
document.getElementById("vbitrate").style.display = "none";
document.getElementById("scale").style.display = "none";
document.getElementById("labelPreset").style.display = "none";
document.getElementById("labelScale").style.display = "none";
document.getElementById("labelCodec").style.display = "none";
document.getElementById("labelBitrate").style.display = "none";
document.getElementById("labelBitrateUnit").style.display = "none";
document.getElementById("labelPriority").style.display = "none";
document.getElementById("movflags").style.display = "none";
document.getElementById("note").style.display = "none";
document.getElementById("buttons").setAttribute('style', 'display: none !important');
},
success: function (element) {
element = element.replace(/null/g, '');
console.log(element);
response = JSON.parse(element);
if (response.code == 1) {
this.filesClient = OC.Files.getClient();
close();
context.fileList.reload();
} else {
context.fileList.showFileBusyState(tr, false);
close();
OC.dialogs.alert(
t('video_converter', response.desc),
t('video_converter', 'Error converting ' + filename)
);
}
}
});
});
}

document.getElementById(type).addEventListener("click", function ($element) {
if (context.fileInfoModel.attributes.mountType == "external") {
var data = {
nameOfFile: filename,
directory: context.dir,
external: 1,
type: $element.target.id,
preset: preset,
priority: priority,
movflags: faststart,
codec: vcodec,
acodec: acodec,
vbitrate: vbitrate,
scale: scaling,
mtime: context.fileInfoModel.attributes.mtime,
};
} else {
var data = {
nameOfFile: filename,
directory: context.dir,
external: 0,
type: $element.target.id,
preset: preset,
priority: priority,
movflags: faststart,
codec: vcodec,
acodec: acodec,
vbitrate: vbitrate,
scale: scaling,
shareOwner: context.fileList.dirInfo.shareOwnerId,
};
}
var tr = context.fileList.findFileEl(filename);
context.fileList.showFileBusyState(tr, true);
$.ajax({
type: "POST",
async: "true",
url: OC.filePath('video_converter', 'ajax', 'convertHere.php'),
data: data,
beforeSend: function () {
document.getElementById("loading").style.display = "block";
document.getElementById("noteLoading").style.display = "block";
document.getElementById("params").style.display = "none";
document.getElementById("text").style.display = "none";
document.getElementById("preset").style.display = "none";
document.getElementById("vcodec").style.display = "none";
document.getElementById("acodec").style.display = "none";
document.getElementById("vbitrate").style.display = "none";
document.getElementById("scale").style.display = "none";
document.getElementById("labelPreset").style.display = "none";
document.getElementById("labelScale").style.display = "none";
document.getElementById("labelCodecV").style.display = "none";
document.getElementById("labelCodecA").style.display = "none";
document.getElementById("labelBitrate").style.display = "none";
document.getElementById("labelBitrateUnit").style.display = "none";
document.getElementById("labelPriority").style.display = "none";
document.getElementById("movflags").style.display = "none";
document.getElementById("note").style.display = "none";
document.getElementById("buttons").setAttribute('style', 'display: none !important');
},
success: function (element) {
element = element.replace(/null/g, '');
console.log(element);
response = JSON.parse(element);
if (response.code == 1) {
this.filesClient = OC.Files.getClient();
close();
context.fileList.reload();
} else {
context.fileList.showFileBusyState(tr, false);
close();
OC.dialogs.alert(
t('video_converter', response.desc),
t('video_converter', 'Error converting ' + filename)
);
}
}
});
});
});
}
});
Expand Down
36 changes: 25 additions & 11 deletions lib/Controller/ConversionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,32 @@ public function getFile($directory, $fileName){
/**
* @NoAdminRequired
*/
public function convertHere($nameOfFile, $directory, $external, $type, $preset, $priority, $movflags = false, $codec = null, $vbitrate = null, $scale = null, $shareOwner = null, $mtime = 0) {
public function convertHere($nameOfFile, $directory, $external, $type, $preset, $priority, $movflags = false, $codec = null, $acodec = null, $vbitrate = null, $scale = null, $shareOwner = null, $mtime = 0) {
$file = $this->getFile($directory, $nameOfFile);
$dir = dirname($file);
$response = array();
if (file_exists($file)){
$cmd = $this->createCmd($file, $preset, $type, $priority, $movflags, $codec, $vbitrate, $scale);
$cmd = $this->createCmd($file, $preset, $type, $priority, $movflags, $codec, $acodec, $vbitrate, $scale);
exec($cmd, $output,$return);
// if the file is in external storage, and also check if encryption is enabled
if($external || \OC::$server->getEncryptionManager()->isEnabled()){
//put the temporary file in the external storage
Filesystem::file_put_contents($directory . '/' . pathinfo($nameOfFile)['filename'].".".$type, file_get_contents(dirname($file) . '/' . pathinfo($file)['filename'].".".$type));
Filesystem::file_put_contents($directory . '/' . pathinfo($nameOfFile)['filename']."_converted.".$type, file_get_contents(dirname($file) . '/' . pathinfo($file)['filename']."_converted.".$type));
// check that the temporary file is not the same as the new file
if(Filesystem::getLocalFile($directory . '/' . pathinfo($nameOfFile)['filename'].".".$type) != dirname($file) . '/' . pathinfo($file)['filename'].".".$type){
unlink(dirname($file) . '/' . pathinfo($file)['filename'].".".$type);
if(Filesystem::getLocalFile($directory . '/' . pathinfo($nameOfFile)['filename']."_converted.".$type) != dirname($file) . '/' . pathinfo($file)['filename']."_converted.".$type){
unlink(dirname($file) . '/' . pathinfo($file)['filename']."_converted.".$type);
}
}else{
//create the new file in the NC filesystem
Filesystem::touch($directory . '/' . pathinfo($file)['filename'].".".$type);
Filesystem::touch($directory . '/' . pathinfo($file)['filename']."_converted.".$type);
}
//if ffmpeg is throwing an error
if($return == 127){
$response = array_merge($response, array("code" => 0, "desc" => "ffmpeg is not installed or available \n
DEBUG(".$return."): " . $file . ' - '.$output));
$converted_file_to_check = dirname($file) . '/' . pathinfo($file)['filename']."_converted.".$type;
if (($return == 127) || (!file_exists($converted_file_to_check)) || (filesize($converted_file_to_check) == 0)) {
$response = array_merge($response, array("code" => 0, "desc" => "Convert failed (ffmpeg code = $return)" ));
if (file_exists($converted_file_to_check)) {
unlink($converted_file_to_check);
}
return json_encode($response);
}else{
$response = array_merge($response, array("code" => 1));
Expand All @@ -67,7 +70,7 @@ public function convertHere($nameOfFile, $directory, $external, $type, $preset,
/**
* @NoAdminRequired
*/
public function createCmd($file, $preset, $output, $priority, $movflags, $codec, $vbitrate, $scale){
public function createCmd($file, $preset, $output, $priority, $movflags, $codec, $acodec, $vbitrate, $scale){
$middleArgs = "";
if ($output == "webm"){
switch ($preset) {
Expand Down Expand Up @@ -99,6 +102,17 @@ public function createCmd($file, $preset, $output, $priority, $movflags, $codec,
} else {
$middleArgs = "-preset ".escapeshellarg($preset). " -strict -2";
}

if ($acodec != null){
switch ($acodec) {
case 'aac':
$middleArgs = " -acodec aac";
break;
case 'an':
$middleArgs = " -an";
break;
}
}

if ($movflags) {
$middleArgs = $middleArgs." -movflags +faststart ";
Expand Down Expand Up @@ -179,7 +193,7 @@ public function createCmd($file, $preset, $output, $priority, $movflags, $codec,
if($codec == "copy"){
$middleArgs = "-codec copy";
}
$cmd = " ffmpeg -y -i ".escapeshellarg($file)." ".$middleArgs." ".escapeshellarg(dirname($file) . '/' . pathinfo($file)['filename'].".".$output);
$cmd = " ffmpeg -y -i ".escapeshellarg($file)." ".$middleArgs." ".escapeshellarg(dirname($file) . '/' . pathinfo($file)['filename']."_converted.".$output);
if ($priority != "0"){
$cmd = "nice -n ".escapeshellarg($priority).$cmd;
}
Expand Down