flanchan
/
doushio
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: flanchan:master
Branches Tags
flanchan:no-tripcode
flanchan:fix-tripcode
flanchan:master
flanchan:dbt
flanchan:hash-command-arbitrary
Mil:audio
Mil:master
Mil:no-ffi
Mil:dbt
Mil:hash-command-arbitrary
..
compare: Mil:audio
Branches Tags
Mil:audio
Mil:master
Mil:no-ffi
Mil:dbt
Mil:hash-command-arbitrary
flanchan:no-tripcode
flanchan:fix-tripcode
flanchan:master
flanchan:dbt
flanchan:hash-command-arbitrary

1 Commits
master ... audio

Author SHA1 Message Date
Mil f9923abb69 Audio uploads!
2 years ago
7 changed files with 275 additions and 78 deletions
Show Stats

113
client/options.js
Unescape View File

@ -316,7 +316,7 @@ function toggle_expansion(img, event) {
if (event.metaKey) if (event.metaKey)
return; return;
event.preventDefault(); event.preventDefault();
var expand = !img.data('thumbSrc'); var expand = !img.data('thumbSrc');
img.closest('article').toggleClass('expanded', expand); img.closest('article').toggleClass('expanded', expand);
var $imgs = img; var $imgs = img;
if (THREAD && (event.altKey || event.shiftKey)) { if (THREAD && (event.altKey || event.shiftKey)) {
@ -332,7 +332,7 @@ function toggle_expansion(img, event) {
with_dom(function () { with_dom(function () {
$imgs.each(function () { $imgs.each(function () {
var $img = $(this); var $img = $(this);
if (expand) if (expand)
expand_image($img); expand_image($img);
else { else {
contract_image($img, event); contract_image($img, event);
@ -344,24 +344,30 @@ function toggle_expansion(img, event) {
function contract_image($img, event) { function contract_image($img, event) {
var thumb = $img.data('thumbSrc'); var thumb = $img.data('thumbSrc');
if (!thumb) var audio = $($img).parent().siblings("audio");
return; if (audio.length > 0) {
// try to keep the thumbnail in-window for large images $img.data("thumbSrc", null);
var h = $img.height(); audio.remove();
var th = parseInt($img.data('thumbHeight'), 10); }
if (event) { else {
var y = $img.offset().top, t = $(window).scrollTop(); if (!thumb)
if (y < t && th < h) return;
window.scrollBy(0, Math.max(th - h, // try to keep the thumbnail in-window for large images
y - t - event.clientY + th/2)); var h = $img.height();
var th = parseInt($img.data('thumbHeight'), 10);
if (event) {
var y = $img.offset().top, t = $(window).scrollTop();
if (y < t && th < h)
window.scrollBy(0, Math.max(th - h,
y - t - event.clientY + th/2));
}
if (fullWidthExpansion)
contract_full_width(parent_post($img));
$img.replaceWith($('<img>')
.width($img.data('thumbWidth')).height(th)
.attr('src', thumb));
} }
if (fullWidthExpansion)
contract_full_width(parent_post($img));
$img.replaceWith($('<img>')
.width($img.data('thumbWidth')).height(th)
.attr('src', thumb));
} }
function expand_image($img) { function expand_image($img) {
if ($img.data('thumbSrc')) if ($img.data('thumbSrc'))
return; return;
@ -372,36 +378,49 @@ function expand_image($img) {
var cap = a.siblings('figcaption').text(); var cap = a.siblings('figcaption').text();
var dims = cap.match(/(\d+)x(\d+)/); var dims = cap.match(/(\d+)x(\d+)/);
var video = /^Video/.test(cap); var video = /^Video/.test(cap);
if (!dims) var audio = /^Audio/.test(cap);
return; if (dims) {
var tw = $img.width(), th = $img.height(); var tw = $img.width(), th = $img.height();
var w = parseInt(dims[1], 10), h = parseInt(dims[2], 10); var w = parseInt(dims[1], 10), h = parseInt(dims[2], 10);
// if this is a high-density screen, reduce image size appropriately // if this is a high-density screen, reduce image size appropriately
var r = window.devicePixelRatio; var r = window.devicePixelRatio;
if (!options.get('nohighres') && !video && r && r > 1) { if (!options.get('nohighres') && !video && r && r > 1) {
var min = 1000; var min = 1000;
if ((w > min || h > min) && w/r > tw && h/r > th) { if ((w > min || h > min) && w/r > tw && h/r > th) {
w /= r; w /= r;
h /= r; h /= r;
}
} }
} $img.remove();
$img = $(video ? '<video>' : '<img>', {
$img.remove(); src: href,
$img = $(video ? '<video>' : '<img>', { width: w, height: h,
src: href, data: {
width: w, height: h, thumbWidth: tw, thumbHeight: th,
data: { thumbSrc: $img.attr('src'),
thumbWidth: tw, thumbHeight: th, },
thumbSrc: $img.attr('src'), prop: video ? {autoplay: true, loop: true} : {},
}, }).appendTo(a);
prop: video ? {autoplay: true, loop: true} : {}, var fit = options.get('inlinefit');
}).appendTo(a); if (fit != 'none') {
var both = fit == 'both';
var fit = options.get('inlinefit'); fit_to_window($img, w, h, both || fit == 'width',
if (fit != 'none') { both || fit == 'height');
var both = fit == 'both'; }
fit_to_window($img, w, h, both || fit == 'width', } else if (audio) {
both || fit == 'height'); //$fig = this.$el.children('figure');
$aud = $('<audio/>', {
src: href,
width: 300,
height: '3em',
autoplay: true,
loop: false,
controls: true
}).insertAfter(a);
$img.data("thumbSrc", $aud);
//if (vol)
// $fig.find('audio')['0'].volume = vol;
//this.model.set('imageExpanded', true);
} }
} }

38
common.js
Unescape View File

@ -797,26 +797,34 @@ OS.gazou = function (info, toppu) {
} }
else { else {
src = encodeURI(this.image_paths().src + info.src); src = encodeURI(this.image_paths().src + info.src);
video = info.video || (/\.webm$/i.test(src) && 'webm'); // webm check is legacy caption = [
caption = [video ? 'Video ' : 'Image ', new_tab_link(src, info.src)]; (/\.(mp3|ogg|wav|flac)/.test(info.src)?'Audio':
(this.sauceToggle?image_sauce_id(info.mid):
(/\.(webm|mp4)/.test(info.src)?'Video':'Image'))), ' ',
new_tab_link(src, (this.thumbStyle == 'hide') ? '[Show]' : info.src, 'imageSrc')
];
} }
var img = this.gazou_img(info, toppu); var img = this.gazou_img(info, toppu);
var dims = info.dims[0] + 'x' + info.dims[1]; var dims = info.dims[0] + 'x' + info.dims[1];
return [safe('<figure data-MD5="'), info.MD5, return [safe('<figure data-img="'),
safe('" data-size="'), info.size, safe(info.spoiler ? '" data-spoiler="' : ''), info.spoiler || '',
video ? [safe('" data-video="'), video] : '', safe('"><figcaption>'),
safe('"><figcaption>'), caption, safe(' <i>('),
caption, safe(' <i>('), (this.spoilToggle && info.spoiler ? 'Spoiler, ' : ''),
info.audio ? (audioIndicator + ', ') : '', info.audio ? (audioIndicator + ', ') : '',
info.duration ? (info.duration + ', ') : '', (info.songTitle || info.artist) ?
readable_filesize(info.size), ', ', [safe('<abbr style="font-weight: bold;" title="'), songTitleText,
dims, (info.apng ? ', APNG' : ''), safe('">'), soundInformation, safe('</abbr>'), ', '] : '',
this.full ? [', ', chibi(info.imgnm, img.src)] : '', info.duration ? (info.duration + ', ') : '',
safe(')</i></figcaption>'), readable_filesize(info.size),
this.thumbStyle == 'hide' ? '' : img.html, /\.(mp3|ogg|wav|flac)/.test(info.src) ? '' : [', ', dims],
safe('</figure>\n\t')]; (info.apng ? ', APNG' : ''),
this.full ? [', ', chibi(info.imgnm, img.src)] : '',
safe(')</i></figcaption>'),
this.thumbStyle == 'hide' ? '' : img.html,
safe('</figure>\n\t')];
}; };
exports.thumbStyles = ['small', 'sharp', 'large', 'hide']; exports.thumbStyles = ['small', 'sharp', 'large', 'hide'];

1
imager/config.js.example
Unescape View File

@ -36,6 +36,7 @@ module.exports = {
VIDEO_EXTS: ['.webm', '.mp4'], VIDEO_EXTS: ['.webm', '.mp4'],
// allow audio streams // allow audio streams
AUDIO: false, AUDIO: false,
AUDIO_EXTS: ['.mp3', '.flac', '.ogg', '.wav'],
// uncomment this to have all audio uploads overlaid with // uncomment this to have all audio uploads overlaid with
// the corresponding spoiler image // the corresponding spoiler image
/* /*

180
imager/daemon.js
Unescape View File

@ -177,15 +177,18 @@ IU.process = function () {
if (image.ext == '.mov') if (image.ext == '.mov')
image.ext = '.mp4'; image.ext = '.mp4';
if (IMAGE_EXTS.indexOf(image.ext) < 0 if (IMAGE_EXTS.indexOf(image.ext) < 0
&& (!config.VIDEO || config.VIDEO_EXTS.indexOf(image.ext) < 0)) && (!config.VIDEO || config.VIDEO_EXTS.indexOf(image.ext) < 0)
&& (!config.VIDEO || config.AUDIO_EXTS.indexOf(image.ext) < 0))
return this.failure(Muggle('Invalid image format.')); return this.failure(Muggle('Invalid image format.'));
image.imgnm = filename.substr(0, 256); image.imgnm = filename.substr(0, 256);
this.status('Verifying...'); this.status('Verifying...');
if (config.VIDEO_EXTS.indexOf(image.ext) >= 0) if (config.VIDEO_EXTS.indexOf(image.ext) >= 0)
video_still(image.path, image.ext, this.verify_video.bind(this)); video_still(image.path, image.ext, this.verify_video.bind(this));
else if (config.AUDIO_EXTS.indexOf(image.ext) >= 0)
audio_still(image.path, this.verify_audio.bind(this));
else if (image.ext == '.jpg' && jpegtranBin && jheadBin) else if (image.ext == '.jpg' && jpegtranBin && jheadBin)
jobs.schedule(new AutoRotateJob(image.path), this.verify_image.bind(this)); jobs.schedule(new AutoRotateJob(image.path), this.verify_image.bind(this));
else else
this.verify_image(); this.verify_image();
}; };
@ -210,6 +213,166 @@ AutoRotateJob.prototype.perform_job = function () {
}); });
}; };
function AudioStillJob(src) {
jobs.Job.call(this);
this.src = src;
}
util.inherits(AudioStillJob, jobs.Job);
AudioStillJob.prototype.describe_job = function () {
return "FFmpeg audio still of " + this.src;
};
AudioStillJob.prototype.perform_job = function () {
var self = this;
self.get_info();
}
AudioStillJob.prototype.get_info = function () {
var self = this;
var audioData = {};
child_process.execFile(ffprobeBin, [this.src],
function(err, stdout, stderr){
var type = stderr.match(/Input #0, (.*),/);
if (type)
audioData.type = type[1];
var title = stderr.match(/title\s+: (.*)/i);
if (title)
audioData.title = title[1];
var artist = stderr.match(/artist\s+: (.*)/i);
if (artist)
audioData.artist = artist[1];
var l = stderr.match(/Duration: (\d{2}):(\d{2}):(\d{2})\.(\d{2})/);
if (l){
var h = (l[1] != '00' ? l[1] + 'h' : '');
var m = (l[2] != '00' ? l[2] + 'm' : '');
var s = (l[3] != '00' ? l[3] + 's' : '');
audioData.total = parseFloat(parseFloat(l[1])*3600 +
parseFloat(l[2])*60 + parseFloat(l[3]) + '.' + parseFloat(l[4]));
audioData.length = h + m + s;
}
self.short_test(audioData);
});
}
AudioStillJob.prototype.short_test = function (audioData) {
var self = this;
var dest = index.media_path('tmp', 'still_'+etc.random_id());
if (audioData.total <= 10) {
if (!config.AUDIOFILE_IMAGE) {
var msg = "Failure serverside.";
var prob = "Missing AUDIOFILE_IMAGE.";
winston.warn(prob);
fs.unlink(dest, function (err) {
self.finish_job(Muggle(msg, prob));
});
return;
}
fs.readFile(config.AUDIOFILE_IMAGE, function (errRead, img) {
if (errRead) {
var msg = "Failure serverside.";
var prob = "Error reading AUDIOFILE_IMAGE";
winston.warn(prob);
fs.unlink(dest, function (err) {
self.finish_job(Muggle(msg, prob));
});
return;
}
fs.writeFile(dest, img, function (errWrite) {
if (errWrite) {
var msg = "Failure serverside.";
var prob = "Error copying AUDIOFILE_IMAGE";
winston.warn(prob);
fs.unlink(dest, function (err) {
self.finish_job(Muggle(msg, prob));
});
return;
}
self.finish_job(null, {
still_path: dest,
duration: audioData.length,
audiotype: audioData.type,
title: audioData.title,
artist: audioData.artist,
});
});
});
} else {
self.encode_thumb(audioData, dest);
}
}
AudioStillJob.prototype.encode_thumb = function (audioData, dest) {
var self = this;
var args = ['-hide_banner', '-loglevel', 'info',
'-f', 'lavfi', '-ss', (Math.floor(audioData.total/2) <= 10 ?
Math.floor(audioData.total - audioData.total/10) : Math.floor(audioData.total/2)),
'-i', 'amovie=' + this.src + ', asplit [a][out1];[a] showspectrum=mode=separate:color=intensity:slide=1:scale=cbrt [out0]',
'-f', 'image2', '-vframes', '1', '-vcodec', 'png',
'-y', dest];
var opts = {env: {AV_LOG_FORCE_NOCOLOR: '1'}};
child_process.execFile(ffmpegBin, args, opts,
function (err, stdout, stderr) {
var lines = stderr ? stderr.split('\n') : [];
var first = lines[0];
if (err) {
var msg;
if (/no such file or directory/i.test(first))
msg = "Audio went missing.";
else if (/invalid data found when/i.test(first))
msg = "Invalid audio file.";
else if (/^ffmpeg version/i.test(first))
msg = "Server's ffmpeg is too old.";
else {
msg = "Unknown audio reading error.";
winston.warn("Unknown ffmpeg output: "+first);
}
fs.unlink(dest, function (err) {
self.finish_job(Muggle(msg, stderr));
});
return;
}
self.finish_job(null, {
still_path: dest,
duration: audioData.length,
audiotype: audioData.type,
title: audioData.title,
artist: audioData.artist,
});
});
};
function audio_still(src, cb) {
jobs.schedule(new AudioStillJob(src), cb);
}
IU.verify_audio = function (err, info) {
if (err)
return this.failure(err);
var self = this;
this.db.track_temporary(info.still_path, function (err) {
if (err)
winston.warn("Tracking error: " + err);
// pretend it's a PNG for the next steps
var image = self.image;
image.video_path = image.path;
image.path = info.still_path;
image.ext = '.png';
if (info.duration)
image.duration = info.duration;
if (info.audiotype)
image.audiofile = info.audiotype;
if (info.title)
image.title = info.title;
if (info.artist)
image.artist = info.artist;
self.verify_image();
});
};
function StillJob(src, ext) { function StillJob(src, ext) {
jobs.Job.call(this); jobs.Job.call(this);
this.src = src; this.src = src;
@ -305,6 +468,10 @@ function video_still(src, ext, cb) {
jobs.schedule(new StillJob(src, ext), cb); jobs.schedule(new StillJob(src, ext), cb);
} }
function audio_thumb(src, ext, cb) {
jobs.schedule(new AudioJob(src, ext), cb);
}
IU.verify_video = function (err, info) { IU.verify_video = function (err, info) {
if (err) if (err)
return this.failure(err); return this.failure(err);
@ -474,8 +641,8 @@ IU.got_nails = function () {
var image = this.image; var image = this.image;
if (image.video_path) { if (image.video_path) {
// stop pretending this is just a still image // stop pretending this is just a still image
image.path = image.video_path; image.path = image.video_path;
image.ext = '.' + image.video; image.ext = image.audiofile ? '.'+image.audiofile : '.'+image.video;
delete image.video_path; delete image.video_path;
} }
@ -532,9 +699,10 @@ var identifyBin, convertBin;
which('identify', function (err, bin) { if (err) throw err; identifyBin = bin; }); which('identify', function (err, bin) { if (err) throw err; identifyBin = bin; });
which('convert', function (err, bin) { if (err) throw err; convertBin = bin; }); which('convert', function (err, bin) { if (err) throw err; convertBin = bin; });
var ffmpegBin; var ffmpegBin, ffprobeBin;
if (config.VIDEO) { if (config.VIDEO) {
which('ffmpeg', function (err, bin) { if (err) throw err; ffmpegBin = bin; }); which('ffmpeg', function (err, bin) { if (err) throw err; ffmpegBin = bin; });
which('ffprobe', function (err, bin) { if (err) throw err; ffprobeBin = bin; });
} }
/* optional JPEG auto-rotation */ /* optional JPEG auto-rotation */

2
imager/index.js
Unescape View File

@ -12,7 +12,7 @@ exports.Onegai = db.Onegai;
exports.config = config; exports.config = config;
var image_attrs = ('src thumb dims size MD5 hash imgnm spoiler realthumb vint' var image_attrs = ('src thumb dims size MD5 hash imgnm spoiler realthumb vint'
+ ' apng mid audio video duration').split(' '); + ' apng mid audio video duration audiofile').split(' ');
exports.image_attrs = image_attrs; exports.image_attrs = image_attrs;
exports.send_dead_image = function (kind, filename, resp) { exports.send_dead_image = function (kind, filename, resp) {

3
package.json
Unescape View File

@ -22,8 +22,9 @@
"chart.js": "^2.7.2", "chart.js": "^2.7.2",
"diskspace": "^2.0.0", "diskspace": "^2.0.0",
"formidable": "1.0.17", "formidable": "1.0.17",
"hashloli": "git+ssh://git@git.flanchan.moe:flanchan/hashloli.git", "hashloli": "git+ssh://public@flanchan.moe:hashloli.git",
"jsoncompress": "^0.1.3", "jsoncompress": "^0.1.3",
"kana-hash": "file:../../home/avril/software/libkhash/node",
"minimist": "1.2.0", "minimist": "1.2.0",
"nan": "^2.14.0", "nan": "^2.14.0",
"recaptcha2": "^1.3.2", "recaptcha2": "^1.3.2",

16
server/server.js
Unescape View File

@ -2,7 +2,7 @@ var opts = require('./opts');
if (require.main == module) opts.parse_args(); if (require.main == module) opts.parse_args();
opts.load_defaults(); opts.load_defaults();
//const khash = require("kana-hash"); const khash = require("kana-hash");
var _ = require('../lib/underscore'), var _ = require('../lib/underscore'),
amusement = require('./amusement'), amusement = require('./amusement'),
@ -23,7 +23,7 @@ var _ = require('../lib/underscore'),
render = require('./render'), render = require('./render'),
request = require('request'), request = require('request'),
STATE = require('./state'), STATE = require('./state'),
//tripcode = require('../tripcode').make(),//{hash:function(a,b){return new khash.Kana(0, this.salt).once(a);}, setSalt:function(a){if(a) this.salt = new khash.Salt(a); else this.salt = khash.Salt.Default; return this.salt;}}, //require('./../tripcode/tripcode'), tripcode = require('../tripcode').make(),//{hash:function(a,b){return new khash.Kana(0, this.salt).once(a);}, setSalt:function(a){if(a) this.salt = new khash.Salt(a); else this.salt = khash.Salt.Default; return this.salt;}}, //require('./../tripcode/tripcode'),
urlParse = require('url').parse, urlParse = require('url').parse,
web = require('./web'), web = require('./web'),
winston = require('winston'); winston = require('winston');
@ -845,12 +845,12 @@ function allocate_post(msg, client, callback) {
post.name = parsed[0]; post.name = parsed[0];
var spec = STATE.hot.SPECIAL_TRIPCODES; var spec = STATE.hot.SPECIAL_TRIPCODES;
if (spec && parsed[1] && parsed[1] in spec) { if (spec && parsed[1] && parsed[1] in spec) {
post.trip = spec[parsed[1]]; post.trip = spec[parsed[1]];
} }
else if (parsed[1] || parsed[2]) { else if (parsed[1] || parsed[2]) {
var trip = "Can this just be a string?"; //tripcode.hash(parsed[1], parsed[2]); var trip = tripcode.hash(parsed[1], parsed[2]);
if (trip) if (trip)
post.trip = trip; post.trip = trip;
} }
} }
if (msg.email) { if (msg.email) {
@ -1245,8 +1245,8 @@ function non_daemon_pid_setup() {
if (require.main == module) { if (require.main == module) {
if (!process.getuid()) if (!process.getuid())
throw new Error("Refusing to run as root."); throw new Error("Refusing to run as root.");
// if (!tripcode.setSalt(config.SECURE_SALT)) if (!tripcode.setSalt(config.SECURE_SALT))
// throw "Bad SECURE_SALT"; throw "Bad SECURE_SALT";
async.series([ async.series([
imager.make_media_dirs, imager.make_media_dirs,
setup_imager_relay, setup_imager_relay,

Write Preview
Loading…
Cancel
Save