LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

formatted trending images and added homepage section

Browse source
This commit is contained in:
bill bittner 2017-07-11 16:55:03 -07:00
parent 3fa69fd75e
commit f8ad476488
24 changed files with 148 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/default.json
View file

@ -12,7 +12,6 @@
"PublishUploadPath": "none"
},
"Logging": {
"LogLevel": "none",
"LogDirectory": "none"
"LogLevel": "none"
}
}

5
config/development.json
View file

@ -9,10 +9,9 @@
},
"Database": {
"MySqlConnectionUri": "none",
"PublishUploadPath": "C:\\lbry\\speech\\hosted_content\\"
"PublishUploadPath": "C:\\Users\\Bones\\Downloads\\lbry\\"
},
"Logging": {
"LogLevel": "silly",
"LogDirectory": "C:\\lbry\\speech\\logs\\"
"LogLevel": "silly"
}
}

18
config/loggerSetup.js
View file

@ -1,10 +1,4 @@
const fs = require('fs');
module.exports = (winston, logLevel, logDir) => {
if (!fs.existsSync(logDir)) {
fs.mkdirSync(logDir);
}
module.exports = (winston, logLevel) => {
winston.configure({
transports: [
new (winston.transports.Console)({
@ -15,16 +9,6 @@ module.exports = (winston, logLevel, logDir) => {
handleExceptions : true,
humanReadableUnhandledException: true,
}),
new (winston.transports.File)({
filename : `${logDir}/speechLogs.log`,
level : logLevel,
json : false,
timestamp : true,
colorize : true,
prettyPrint : true,
handleExceptions : true,
humanReadableUnhandledException: true,
}),
],
});

3
config/production.json
View file

@ -12,7 +12,6 @@
"PublishUploadPath": "/home/lbry/Downloads/"
},
"Logging": {
"LogLevel": "verbose",
"LogDirectory": "/home/lbry/Logs"
"LogLevel": "verbose"
}
}

3
config/test.json
View file

@ -12,7 +12,6 @@
"PublishUploadPath": "/home/ubuntu/Downloads/"
},
"Logging": {
"LogLevel": "debug",
"LogDirectory": "/home/ubuntu/Logs"
"LogLevel": "debug"
}
}

32
controllers/statsController.js
View file

@ -5,7 +5,7 @@ const db = require('../models');
const googleApiKey = config.get('AnalyticsConfig.GoogleId');
module.exports = {
postToStats (action, url, ipAddress, name, claimId, result) {
postToStats (action, url, ipAddress, name, claimId, fileName, fileType, nsfw, result) {
logger.silly(`creating ${action} record for statistics db`);
// make sure the result is a string
if (result && (typeof result !== 'string')) {
@ -22,6 +22,9 @@ module.exports = {
ipAddress,
name,
claimId,
fileName,
fileType,
nsfw,
result,
})
.then()
@ -73,13 +76,14 @@ module.exports = {
},
})
.then(data => {
const resultHashTable = {};
let resultHashTable = {};
let totalServe = 0;
let totalPublish = 0;
let totalShow = 0;
let totalCount = 0;
let totalSuccess = 0;
let totalFailure = 0;
let percentSuccess;
// sumarise the data
for (let i = 0; i < data.length; i++) {
let key = data[i].action + data[i].url;
@ -122,7 +126,7 @@ module.exports = {
}
}
}
const percentSuccess = Math.round(totalSuccess / totalCount * 100);
percentSuccess = Math.round(totalSuccess / totalCount * 100);
// return results
resolve({ records: resultHashTable, totals: { totalServe, totalPublish, totalShow, totalCount, totalSuccess, totalFailure }, percentSuccess });
})
@ -152,28 +156,27 @@ module.exports = {
},
})
.then(data => {
const resultHashTable = {};
let resultHashTable = {};
let sortableArray = [];
let sortedArray;
// summarise the data
for (let i = 0; i < data.length; i++) {
let key = `${data[i].name}#${data[i].claimId}`;
logger.debug(key);
console.log(resultHashTable[key]);
if (resultHashTable[key] === undefined) {
// console.log(resultHashTable[key]);
resultHashTable[key] = {
count : 0,
details: {
name : data[i].name,
claimId: data[i].claimId,
name : data[i].name,
claimId : data[i].claimId,
fileName: data[i].fileName,
fileType: data[i].fileType,
nsfw : data[i].nsfw,
},
};
} else {
// console.log(resultHashTable[key]);
resultHashTable[key]['count'] += 1;
}
}
// order the results
let sortableArray = [];
for (let objKey in resultHashTable) {
if (resultHashTable.hasOwnProperty(objKey)) {
sortableArray.push([
@ -183,13 +186,12 @@ module.exports = {
}
}
sortableArray.sort((a, b) => {
return a[0] - b[0];
return b[0] - a[0];
});
const sortedArray = sortableArray.map((a) => {
sortedArray = sortableArray.map((a) => {
return a[1];
});
// return results
logger.debug(sortedArray);
resolve(sortedArray);
})
.catch(error => {

8
helpers/libraries/errorHandlers.js
View file

@ -5,16 +5,16 @@ module.exports = {
handleRequestError (action, originalUrl, ip, error, res) {
logger.error('Request Error >>', error);
if (error.response) {
postToStats(action, originalUrl, ip, null, null, error.response.data.error.messsage);
postToStats(action, originalUrl, ip, null, null, null, null, null, error.response.data.error.messsage);
res.status(error.response.status).send(error.response.data.error.message);
} else if (error.code === 'ECONNREFUSED') {
postToStats(action, originalUrl, ip, null, null, 'Connection refused. The daemon may not be running.');
postToStats(action, originalUrl, ip, null, null, null, null, null, 'Connection refused. The daemon may not be running.');
res.status(503).send('Connection refused. The daemon may not be running.');
} else if (error.message) {
postToStats(action, originalUrl, ip, null, null, error);
postToStats(action, originalUrl, ip, null, null, null, null, null, error);
res.status(400).send(error.message);
} else {
postToStats(action, originalUrl, ip, null, null, error);
postToStats(action, originalUrl, ip, null, null, null, null, null, error);
res.status(400).send(error);
}
},

17
models/stats.js
View file

@ -1,4 +1,4 @@
module.exports = (sequelize, { STRING, TEXT }) => {
module.exports = (sequelize, { STRING, BOOLEAN, TEXT }) => {
const Stats = sequelize.define(
'Stats',
{
@ -13,17 +13,26 @@ module.exports = (sequelize, { STRING, TEXT }) => {
ipAddress: {
type : STRING,
allowNull: true,
default : null,
},
name: {
type : STRING,
allowNull: true,
default : null,
},
claimId: {
type : STRING,
allowNull: true,
default : null,
},
fileName: {
type : STRING,
allowNull: true,
},
fileType: {
type : STRING,
allowNull: true,
},
nsfw: {
type : BOOLEAN,
allowNull: true,
},
result: {
type : TEXT('long'),

62
public/assets/css/componentStyle.css
View file

@ -12,6 +12,29 @@
margin: 2px 5px 2px 5px;
}
/* publish */
#drop-zone {
border: 1px dashed lightgrey;
padding: 1em;
height: 6em;
}
#asset-preview-holder {
width: 100%;
margin-bottom: 1em;
}
.snapshot-generator {
display: block;
height: 1px;
left: 0;
object-fit: contain;
position: fixed;
top: 0;
width: 1px;
z-index: -1;
}
/* show routes */
.show-asset {
width: 100%;
@ -53,7 +76,14 @@ button.copy-button {
vertical-align: top;
}
/* learn more */
/* trending claims */
.asset-trending {
width: 21%;
margin: 2%;
float: left;
}
/* learn more */
.learn-more {
text-align: center;
margin-top: 2px;
@ -115,29 +145,6 @@ button.copy-button {
list-style-type: none;
}
/* publish */
#drop-zone {
border: 1px dashed lightgrey;
padding: 1em;
height: 6em;
}
#asset-preview-holder {
width: 100%;
margin-bottom: 1em;
}
.snapshot-generator {
display: block;
height: 1px;
left: 0;
object-fit: contain;
position: fixed;
top: 0;
width: 1px;
z-index: -1;
}
/* meme */
canvas {
background-color: white;
@ -145,13 +152,6 @@ canvas {
height: auto;
}
.meme-fodder-img {
width: 21%;
padding: 0px;
margin: 2% 4% 2% 0px;
float: left;
}
/* statistics */
.totals-row {
border-top: 1px solid grey;

7
public/assets/css/allStyle.css → public/assets/css/generalStyle.css
View file

@ -91,6 +91,13 @@ h4 {
/* other */
.asset-small {
height: 200px;
padding: 0px;
margin: 10px;
float: left;
}
input {
padding: 0.3em;
}

8
routes/api-routes.js
View file

@ -24,7 +24,7 @@ module.exports = app => {
lbryApi
.getClaimsList(params.name)
.then(claimsList => {
postToStats('serve', originalUrl, ip, null, null, 'success');
postToStats('serve', originalUrl, ip, null, null, null, null, 'success');
res.status(200).json(claimsList);
})
.catch(error => {
@ -56,7 +56,7 @@ module.exports = app => {
lbryApi
.resolveUri(params.uri)
.then(resolvedUri => {
postToStats('serve', originalUrl, ip, null, null, 'success');
postToStats('serve', originalUrl, ip, null, null, null, null, 'success');
res.status(200).json(resolvedUri);
})
.catch(error => {
@ -76,7 +76,7 @@ module.exports = app => {
try {
validateFile(file, name, license, nsfw);
} catch (error) {
postToStats('publish', originalUrl, ip, null, null, error.message);
postToStats('publish', originalUrl, ip, null, null, null, null, error.message);
logger.debug('rejected >>', error.message);
res.status(400).send(error.message);
return;
@ -91,7 +91,7 @@ module.exports = app => {
publishController
.publish(publishParams, fileName, fileType)
.then(result => {
postToStats('publish', originalUrl, ip, null, null, 'success');
postToStats('publish', originalUrl, ip, null, null, null, null, 'success');
res.status(200).json(result);
})
.catch(error => {

16
routes/home-routes.js
View file

@ -1,17 +1,25 @@
const logger = require('winston');
const { postToStats } = require('../controllers/statsController.js');
const { postToStats, getTrendingClaims } = require('../controllers/statsController.js');
const errorHandlers = require('../helpers/libraries/errorHandlers.js');
module.exports = app => {
// route for the home page
app.get('/', ({ headers, ip, originalUrl }, res) => {
// send response
res.status(200).render('index');
const startDate = new Date();
startDate.setDate(startDate.getDate() - 1);
getTrendingClaims(startDate)
.then(result => {
res.status(200).render('index', { trendingAssets: result });
})
.catch(error => {
errorHandlers.handleRequestError(error, res);
});
});
// a catch-all route if someone visits a page that does not exist
app.use('*', ({ originalUrl, ip }, res) => {
logger.error(`404 on ${originalUrl}`);
// post to stats
postToStats('show', originalUrl, ip, null, null, 'Error: 404');
postToStats('show', originalUrl, ip, null, null, null, null, null, 'Error: 404');
// send response
res.status(404).render('fourOhFour');
});

12
routes/serve-routes.js
View file

@ -52,14 +52,14 @@ module.exports = (app) => {
if (headers['accept']) { // note: added b/c some requests errored out due to no accept param in header
const mimetypes = headers['accept'].split(',');
if (mimetypes.includes('text/html')) {
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
res.status(200).render('showLite', { fileInfo });
} else {
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
serveFile(fileInfo, res);
}
} else {
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
serveFile(fileInfo, res);
}
})
@ -82,14 +82,14 @@ module.exports = (app) => {
if (headers['accept']) { // note: added b/c some requests errored out due to no accept param in header
const mimetypes = headers['accept'].split(',');
if (mimetypes.includes('text/html')) {
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
res.status(200).render('showLite', { fileInfo });
} else {
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
serveFile(fileInfo, res);
}
} else {
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('serve', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
serveFile(fileInfo, res);
}
})

10
routes/show-routes.js
View file

@ -27,7 +27,7 @@ module.exports = (app) => {
startDate.setDate(startDate.getDate() - 1);
getStatsSummary(startDate)
.then(result => {
postToStats('show', originalUrl, ip, null, null, 'success');
postToStats('show', originalUrl, ip, null, null, null, null, null, 'success');
res.status(200).render('statistics', result);
})
.catch(error => {
@ -39,7 +39,7 @@ module.exports = (app) => {
// get and render the content
getAllClaims('meme-fodder')
.then(orderedFreePublicClaims => {
postToStats('show', originalUrl, ip, null, null, 'success');
postToStats('show', originalUrl, ip, null, null, null, null, null, 'success');
res.status(200).render('memeFodder', { claims: orderedFreePublicClaims });
})
.catch(error => {
@ -55,7 +55,7 @@ module.exports = (app) => {
res.status(307).render('noClaims');
return;
}
postToStats('show', originalUrl, ip, null, null, 'success');
postToStats('show', originalUrl, ip, null, null, null, null, null, 'success');
res.status(200).render('allClaims', { claims: orderedFreePublicClaims });
})
.catch(error => {
@ -73,7 +73,7 @@ module.exports = (app) => {
return;
}
// serve the file or the show route
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
res.status(200).render('show', { fileInfo });
})
.catch(error => {
@ -91,7 +91,7 @@ module.exports = (app) => {
return;
}
// serve the show route
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
postToStats('show', originalUrl, ip, fileInfo.name, fileInfo.claimId, fileInfo.fileName, fileInfo.fileType, fileInfo.nsfw, 'success');
res.status(200).render('show', { fileInfo });
})
.catch(error => {

8
routes/sockets-routes.js
View file

@ -27,7 +27,7 @@ module.exports = (app, siofu, hostedContentPath) => {
// listener for when file upload encounters an error
uploader.on('error', ({ error }) => {
logger.error('an error occured while uploading', error);
postToStats('publish', '/', null, null, error);
postToStats('publish', '/', null, null, null, null, error);
socket.emit('publish-status', error);
});
// listener for when file has been uploaded
@ -41,18 +41,18 @@ module.exports = (app, siofu, hostedContentPath) => {
publishController
.publish(publishParams, file.name, file.meta.type)
.then(result => {
postToStats('publish', '/', null, null, 'success');
postToStats('publish', '/', null, null, null, null, 'success');
socket.emit('publish-complete', { name: publishParams.name, result });
})
.catch(error => {
error = errorHandlers.handlePublishError(error);
postToStats('publish', '/', null, null, error);
postToStats('publish', '/', null, null, null, null, error);
socket.emit('publish-failure', error);
});
} else {
logger.error(`An error occurred in uploading the client's file`);
socket.emit('publish-failure', 'File uploaded, but with errors');
postToStats('publish', '/', null, null, 'File uploaded, but with errors');
postToStats('publish', '/', null, null, null, null, 'File uploaded, but with errors');
// to-do: remove the file if not done automatically
}
});

17
server.js
View file

@ -11,8 +11,7 @@ const hostedContentPath = config.get('Database.PublishUploadPath');
// configure logging
const logLevel = config.get('Logging.LogLevel');
const logDir = config.get('Logging.LogDirectory');
require('./config/loggerSetup.js')(winston, logLevel, logDir);
require('./config/loggerSetup.js')(winston, logLevel);
// set port
const PORT = 3000;
@ -92,9 +91,13 @@ const server = require('./routes/sockets-routes.js')(app, siofu, hostedContentPa
// sync sequelize
// wrap the server in socket.io to intercept incoming sockets requests
// start server
db.sequelize.sync().then(() => {
server.listen(PORT, () => {
winston.info('Trusting proxy?', app.get('trust proxy'));
winston.info(`Server is listening on PORT ${PORT}`);
db.sequelize.sync()
.then(() => {
server.listen(PORT, () => {
winston.info('Trusting proxy?', app.get('trust proxy'));
winston.info(`Server is listening on PORT ${PORT}`);
});
})
.catch((error) => {
winston.log('Error syncing sequelize db:', error);
});
});

3
views/index.handlebars
View file

@ -3,11 +3,14 @@
<div class="full">
{{> publish}}
{{> learnMore}}
{{> trending}}
</div>
{{> footer}}
</div>
<script src="/socket.io/socket.io.js"></script>
<script src="/siofu/client.js"></script>
<script src="/assets/js/generalFunctions.js"></script>
<script src="/assets/js/publishFunctions.js"></script>
<script src="/assets/js/index.js"></script>

3
views/layouts/main.handlebars
View file

@ -5,11 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Spee.ch</title>
<link rel="stylesheet" href="/assets/css/allStyle.css" type="text/css">
<link rel="stylesheet" href="/assets/css/generalStyle.css" type="text/css">
<link rel="stylesheet" href="/assets/css/componentStyle.css" type="text/css">
</head>
<body>
<script src="/assets/js/generalFunctions.js"></script>
{{{ body }}}
<!-- google analytics -->
{{ googleAnalytics }}

1
views/memeFodder.handlebars
View file

@ -10,5 +10,6 @@
<script src="/socket.io/socket.io.js"></script>
<script src="/siofu/client.js"></script>
<script src="/assets/js/generalFunctions.js"></script>
<script src="/assets/js/memeFodder-draw.js"></script>
<script src="/assets/js/memeFodder-publish.js"></script>

2
views/partials/asset.handlebars
View file

@ -1,5 +1,5 @@
<div class="panel">
<div id="asset-placeholder" data-filename="{{{fileInfo.fileName}}}">
<div id="asset-placeholder">
{{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
<video class="show-asset" autoplay controls>
<source src="/api/streamFile/{{fileInfo.fileName}}">

2
views/partials/memeFodderResults.handlebars
View file

@ -5,7 +5,7 @@
</div>
<div class="row">
{{#each claims}}
<img class="meme-fodder-img" src="/{{this.name}}/{{this.claim_id}}" onclick="newCanvas(this)"/>
<img class="asset-small" src="/{{this.name}}/{{this.claim_id}}" onclick="newCanvas(this)"/>
{{/each}}
</div>
</div>

19
views/partials/trending.handlebars Normal file
View file

@ -0,0 +1,19 @@
<div class="full">
<h2>Trending</h2>
{{#each trendingAssets}}
{{#if this.nsfw}}
{{else }}
{{#ifConditional this.fileType '===' 'video/mp4'}}
<video class="asset-small" controls>
<source src="/api/streamFile/{{this.fileName}}">
{{!--fallback--}}
Your browser does not support the <code>video</code> element.
</video>
{{else}}
<a href="/show/{{this.name}}/{{this.claimId}}">
<img class="asset-small" src="/api/streamFile/{{this.fileName}}" />
</a>
{{/ifConditional}}
{{/if}}
{{/each}}
</div>

2
views/showLite.handlebars
View file

@ -1,4 +1,4 @@
<div id="asset-placeholder" data-filename="{{{fileInfo.fileName}}}">
<div id="asset-placeholder">
{{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
<video class="show-asset-lite" autoplay controls>
<source src="/api/streamFile/{{fileInfo.fileName}}">

13
views/trending.handlebars
View file

@ -3,24 +3,15 @@
<div class="full">
<h2>Trending Images </h2>
{{#each trendingAssets}}
<img class="asset-trending" src="/{{this.name}}/{{this.claimId}}" />
<div id="asset-trending" data-filename="{{{this.fileName}}}">
{{#ifConditional this.fileType '===' 'video/mp4'}}
<video class="show-asset" autoplay controls>
<video class="asset-small" controls>
<source src="/api/streamFile/{{this.fileName}}">
{{!--fallback--}}
Your browser does not support the <code>video</code> element.
</video>
{{else}}
<img class="show-asset" src="/api/streamFile/{{this.fileName}}" />
<img class="asset-small" src="/api/streamFile/{{this.fileName}}" />
{{/ifConditional}}
</div>
{{/each}}
</div>
</div>
<script src="/socket.io/socket.io.js"></script>
<script src="/siofu/client.js"></script>
<script src="/assets/js/publishFunctions.js"></script>
<script src="/assets/js/index.js"></script>