OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Video model: namePath -> filename

pull/10/head
Chocobozzz 2016-06-28 20:19:41 +02:00
parent 907e9510c2
commit 5189d08aac
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/controllers/api/v1/videos.js
View File

@ -90,7 +90,7 @@ function addVideo (req, res, next) {
function insertIntoDB (callback) { function insertIntoDB (callback) {
const videoData = { const videoData = {
name: videoInfos.name, name: videoInfos.name,
namePath: videoFile.filename, filename: videoFile.filename,
description: videoInfos.description, description: videoInfos.description,
author: res.locals.oauth.token.user.username, author: res.locals.oauth.token.user.username,
duration: videoFile.duration, duration: videoFile.duration,

18
server/models/video.js
View File

@ -24,7 +24,7 @@ const thumbnailsDir = pathUtils.join(__dirname, '..', '..', config.get('storage.
// TODO: add indexes on searchable columns // TODO: add indexes on searchable columns
const VideoSchema = mongoose.Schema({ const VideoSchema = mongoose.Schema({
name: String, name: String,
namePath: String, filename: String,
description: String, description: String,
magnetUri: String, magnetUri: String,
podUrl: String, podUrl: String,
@ -98,7 +98,7 @@ VideoSchema.pre('save', function (next) {
const tasks = [] const tasks = []
if (video.isOwned()) { if (video.isOwned()) {
const videoPath = pathUtils.join(uploadsDir, video.namePath) const videoPath = pathUtils.join(uploadsDir, video.filename)
this.podUrl = http + '://' + host + ':' + port this.podUrl = http + '://' + host + ':' + port
tasks.push( tasks.push(
@ -134,7 +134,7 @@ mongoose.model('Video', VideoSchema)
// ------------------------------ METHODS ------------------------------ // ------------------------------ METHODS ------------------------------
function isOwned () { function isOwned () {
return this.namePath !== null return this.filename !== null
} }
function toFormatedJSON () { function toFormatedJSON () {
@ -169,7 +169,7 @@ function toRemoteJSON (callback) {
name: self.name, name: self.name,
description: self.description, description: self.description,
magnetUri: self.magnetUri, magnetUri: self.magnetUri,
namePath: null, filename: null,
author: self.author, author: self.author,
duration: self.duration, duration: self.duration,
thumbnailBase64: new Buffer(thumbnailData).toString('base64'), thumbnailBase64: new Buffer(thumbnailData).toString('base64'),
@ -206,12 +206,12 @@ function listByUrls (fromUrls, callback) {
} }
function listOwned (callback) { function listOwned (callback) {
// If namePath is not null this is *our* video // If filename is not null this is *our* video
this.find({ namePath: { $ne: null } }, callback) this.find({ filename: { $ne: null } }, callback)
} }
function listRemotes (callback) { function listRemotes (callback) {
this.find({ namePath: null }, callback) this.find({ filename: null }, callback)
} }
function load (id, callback) { function load (id, callback) {
@ -235,7 +235,7 @@ function seedAllExisting (callback) {
if (err) return callback(err) if (err) return callback(err)
async.each(videos, function (video, callbackEach) { async.each(videos, function (video, callbackEach) {
const videoPath = pathUtils.join(uploadsDir, video.namePath) const videoPath = pathUtils.join(uploadsDir, video.filename)
seed(videoPath, callbackEach) seed(videoPath, callbackEach)
}, callback) }, callback)
}) })
@ -267,7 +267,7 @@ function removeThumbnail (video, callback) {
} }
function removeFile (video, callback) { function removeFile (video, callback) {
fs.unlink(uploadsDir + video.namePath, callback) fs.unlink(uploadsDir + video.filename, callback)
} }
// Maybe the torrent is not seeded, but we catch the error to don't stop the removing process // Maybe the torrent is not seeded, but we catch the error to don't stop the removing process