course: access to group logs

iliakan · iliakan · commit cb1931c5ea0f · 2016-01-31T20:55:21.000+03:00
diff --git a/handlers/courses/controller/groupLogs.js b/handlers/courses/controller/groupLogs.js
@@ -0,0 +1,25 @@
+'use strict';
+
+var path = require('path');
+var config = require('config');
+var fs = require('mz/fs');
+
+// Group info for a participant, with user instructions on how to login
+exports.get = function*() {
+
+  let group = this.groupBySlug;
+
+  let logName = this.params.logName.replace(/[^-.\d\w]/g, '');
+
+  let filePath = path.join(config.jabberLogsRoot, group.webinarId, logName + '.html');
+
+  let exists = yield fs.exists(filePath);
+  if (!exists) {
+    this.throw(404);
+  }
+
+  this.type = 'text/html; charset=utf-8';
+  this.body = fs.createReadStream(filePath);
+
+};
+
diff --git a/handlers/courses/controller/groupMaterials.js b/handlers/courses/controller/groupMaterials.js
@@ -44,6 +44,21 @@ exports.get = function*() {
     });
   }
 
+  let logs;
+  try {
+    logs = yield fs.readdir(config.jabberLogsRoot + '/' + group.webinarId);
+  } catch(e) { // no logs
+    logs = [];
+  }
+
+  logs = logs.sort().map(file => ({
+    title: file,
+    link: `/courses/groups/${group.slug}/logs/${file.replace(/\.html$/, '')}`
+  }));
+
+  this.locals.chatLogs = logs;
+
+
   this.body = this.render('groupMaterials');
 };
 
diff --git a/handlers/courses/router.js b/handlers/courses/router.js
@@ -31,6 +31,8 @@ router.get('/groups/:groupBySlug/materials', mustBeParticipantOrTeacher, require
 router.get('/groups/:groupBySlug/participants-info', mustBeTeacherOrAdmin, require('./controller/participantsInfo').get);
 router.post('/groups/:groupBySlug/materials', mustBeTeacher, require('./controller/groupMaterials').post);
 
+router.get('/groups/:groupBySlug/logs/:logName', mustBeParticipantOrTeacher, require('./controller/groupLogs').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', mustBeParticipantOrTeacher, require('./controller/groupMaterialsDownload').get);
diff --git a/handlers/courses/templates/groupMaterials.jade b/handlers/courses/templates/groupMaterials.jade
@@ -44,8 +44,9 @@ block content
         +b('button').button._action.__submit(type="submit")
           +e('span').text Добавить
 
-  if materials.length
-    +b.courses-materials
+  +b.courses-materials
+
+    if materials.length
 
       if participant
         +e('p').video-key
@@ -68,10 +69,17 @@ block content
                 +e('p').note!= material.comment
             +e('td').size= material.size
             +e('td').added= moment(material.created).format('DD.MM.YYYY')
-  else
-    +b.notification._message._info
-      +e.content Материалов пока нет, будут доступны позже.
+    else
+      +b.notification._message._info
+        +e.content Материалов пока нет, будут доступны позже.
+
 
+    if chatLogs.length
+      h2 Логи чата
 
+      +e('ul').chat-list
+        each item in chatLogs
+          +e('li').chat-list-item
+            a(href=item.link)= item.title
 
 
diff --git a/jabber-logs/.gitkeep b/jabber-logs/.gitkeep
diff --git a/modules/config/index.js b/modules/config/index.js
@@ -110,7 +110,7 @@ var config = module.exports = {
     appId: secret.openexchangerates.appId
   },
 
-  jb:      {
+  jb: {
     email: env.NODE_ENV == 'production' ? secret.jb.email : 'iliakan@gmail.com'
   },
 
@@ -159,8 +159,8 @@ var config = module.exports = {
   publicRoot:            path.join(process.cwd(), 'public'),
   // private files, for expiring links, not directly accessible
   downloadRoot:          path.join(process.cwd(), 'download'),
+  jabberLogsRoot:        path.join(process.cwd(), 'jabber-logs'),
   archiveRoot:           path.join(process.cwd(), 'archive'),
-  courseRoot:            path.join(process.cwd(), 'course'),
   tmpRoot:               path.join(process.cwd(), 'tmp'),
   localesRoot:           path.join(process.cwd(), 'locales'),
   // js/css build versions
diff --git a/modules/iprotect/index.js b/modules/iprotect/index.js
@@ -98,6 +98,8 @@ function* protect(name, filePath, targetDir) {
     });
   };
 
+  yield* del(name);
+
   fs.unlinkSync(protectedPath); // strange bluebird/cls warning if I yield unlink
 
 }
diff --git a/styles/blocks/courses-materials/courses-materials.styl b/styles/blocks/courses-materials/courses-materials.styl
@@ -50,3 +50,6 @@
     &__line:hover &__delete-action
         opacity 1
 
+
+    &__chat-list-item
+        text-align left

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ function* protect(name, filePath, targetDir) {`
`98`	`98`	`});`
`99`	`99`	`};`
`100`	`100`
	`101`	`+ yield* del(name);`
	`102`	`+`
`101`	`103`	`fs.unlinkSync(protectedPath); // strange bluebird/cls warning if I yield unlink`
`102`	`104`
`103`	`105`	`}`