course materials work now

Author: iliakan

handlers/courses/controller/groupMaterialsDownload.js

@@ -20,7 +20,7 @@ exports.get = function*() {
   this.set({
     'Content-Type': 'application/octet-stream',
     'Content-Disposition': 'attachment; filename=' + path.basename(material.filename),
-    'X-Accel-Redirect': '/_download' + group.getMaterialUrl(material)
+    'X-Accel-Redirect': '/_download/' + group.getMaterialFileRelativePath(material)
   });
 
   this.body = '';

handlers/courses/models/courseGroup.js

@@ -48,7 +48,7 @@ var schema = new Schema({
   // group w/o materials can set this to undefined
   // otherwise there will be a link to the page (maybe without files yet)
   materials: {
-    type:    [CourseMaterial],
+    type:    [CourseMaterial.schema],
     default: []
   },
 
@@ -96,15 +96,15 @@ var schema = new Schema({
 
 
 schema.methods.getMaterialUrl = function(material) {
-  return `/courses/groups/${this.slug}/materials/${material.filename}`;
+  return `/courses/download/${this.slug}/${material.filename}`;
 };
 
-schema.methods.getMaterialFilePath = function(material) {
-  return path.join(config.downloadRoot, this.getMaterialUrl(material));
+schema.methods.getMaterialFileRelativePath = function(material) {
+  return `courses/${this.slug}/${material.filename}`;
 };
 
 schema.methods.getMaterialFileSize = function* (material) {
-  var stat = yield fs.stat(this.getMaterialFilePath(material));
+  var stat = yield fs.stat(path.join(config.downloadRoot, this.getMaterialFileRelativePath(material)));
   return stat.size;
 };
 

handlers/courses/router.js

@@ -15,7 +15,11 @@ router.get('/orders/:orderNumber(\\d+)', require('./controller/signup').get);
 
 router.get('/groups/:groupBySlug/info', mustBeParticipant, require('./controller/groupInfo').get);
 router.get('/groups/:groupBySlug/materials', mustBeParticipant, require('./controller/groupMaterials').get);
-router.get('/groups/:groupBySlug/materials/:filename', mustBeParticipant, require('./controller/groupMaterialsDownload').get);
+
+// not groups/:groupBySlug/* url,
+// because the prefix /course/download must be constant for nginx to proxy *.zip to node
+router.get('/download/:groupBySlug/:filename', mustBeParticipant, require('./controller/groupMaterialsDownload').get);
+
 router.get('/groups/:groupBySlug/feedback', mustBeParticipant, require('./controller/groupFeedback').get);
 router.post('/groups/:groupBySlug/feedback', mustBeParticipant, require('./controller/groupFeedback').post);
 

handlers/courses/templates/groupMaterials.jade

@@ -32,7 +32,7 @@ block content
           +e('tr').line
             +e('td').num
             +e('td').name
-              +e('a').link(href=material.filename)= material.title
+              +e('a').link(href=material.url)= material.title
             +e('td').size= material.size
             +e('td').added= moment(material.created).format('DD.MM.YYYY')
   else

nginx/sites-enabled/learn.javascript.ru

@@ -51,11 +51,16 @@ server {
     alias   <%=root%>/download/;
   }
 
-  # restricted download
+  # restricted download (download module)
   location ^~ /download/ {
     include "partial/proxy-3000";
   }
 
+  # restricted download (courses module)
+  location ^~ /courses/download/ {
+    include "partial/proxy-3000";
+  }
+
   # zip for plunk
   location ^~ /tutorial/zipview/ {
     include "partial/proxy-3000";

scripts/nginx-mac

@@ -1,5 +1,5 @@
 #!/bin/bash
-rm /var/log/nginx/*
+sudo rm /var/log/nginx/*
 sudo gulp config:nginx --prefix /opt/local/etc/nginx --env development --root /js/javascript-nodejs --debug
 sudo port unload nginx
 sudo pkill -9 nginx