Video model: namePath -> filename

diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index 83734b35e7581f55481a1a009ae07acbe4c747ea..d06ec8d08b120abb87d3a2926918c04be84c5606 100644 (file)
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
@@ -90,7 +90,7 @@ function addVideo (req, res, next) {
     function insertIntoDB (callback) {
       const videoData = {
         name: videoInfos.name,
-        namePath: videoFile.filename,
+        filename: videoFile.filename,
         description: videoInfos.description,
         author: res.locals.oauth.token.user.username,
         duration: videoFile.duration,

diff --git a/server/models/video.js b/server/models/video.js
index b111e29aa074201b25f0fa22594e4ac8fdeb45b1..a8a70ba89ff41168065e541c743d90e0b4e68953 100644 (file)
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -24,7 +24,7 @@ const thumbnailsDir = pathUtils.join(__dirname, '..', '..', config.get('storage.
 // TODO: add indexes on searchable columns
 const VideoSchema = mongoose.Schema({
   name: String,
-  namePath: String,
+  filename: String,
   description: String,
   magnetUri: String,
   podUrl: String,
@@ -98,7 +98,7 @@ VideoSchema.pre('save', function (next) {
   const tasks = []
 
   if (video.isOwned()) {
-    const videoPath = pathUtils.join(uploadsDir, video.namePath)
+    const videoPath = pathUtils.join(uploadsDir, video.filename)
     this.podUrl = http + '://' + host + ':' + port
 
     tasks.push(
@@ -134,7 +134,7 @@ mongoose.model('Video', VideoSchema)
 // ------------------------------ METHODS ------------------------------
 
 function isOwned () {
-  return this.namePath !== null
+  return this.filename !== null
 }
 
 function toFormatedJSON () {
@@ -169,7 +169,7 @@ function toRemoteJSON (callback) {
       name: self.name,
       description: self.description,
       magnetUri: self.magnetUri,
-      namePath: null,
+      filename: null,
       author: self.author,
       duration: self.duration,
       thumbnailBase64: new Buffer(thumbnailData).toString('base64'),
@@ -206,12 +206,12 @@ function listByUrls (fromUrls, callback) {
 }
 
 function listOwned (callback) {
-  // If namePath is not null this is *our* video
-  this.find({ namePath: { $ne: null } }, callback)
+  // If filename is not null this is *our* video
+  this.find({ filename: { $ne: null } }, callback)
 }
 
 function listRemotes (callback) {
-  this.find({ namePath: null }, callback)
+  this.find({ filename: null }, callback)
 }
 
 function load (id, callback) {
@@ -235,7 +235,7 @@ function seedAllExisting (callback) {
     if (err) return callback(err)
 
     async.each(videos, function (video, callbackEach) {
-      const videoPath = pathUtils.join(uploadsDir, video.namePath)
+      const videoPath = pathUtils.join(uploadsDir, video.filename)
       seed(videoPath, callbackEach)
     }, callback)
   })
@@ -267,7 +267,7 @@ function removeThumbnail (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