Skip to content

Commit

Permalink
1.9.7d equivalent release (d74cc9a)
Browse files Browse the repository at this point in the history
Not yet tested - forceTVON, cecTvStatus, audio playlist and event
playlist configuration checking from Open-source server
  • Loading branch information
ravibail committed Jan 22, 2018
1 parent f740557 commit ed30f13
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
6 changes: 4 additions & 2 deletions app/controllers/players.js
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,10 @@ exports.upload = function (cpuId, filename, data) {
var logData;
if(filename.indexOf('forever_out') == 0 ){
fs.writeFile(config.logStoreDir+'/'+cpuId+'_forever_out.log',data,function(err){
if(err)
console.log("error","Error in writing forever_out log for "+ cpuId);
if(err) {
console.log("error", "Error in writing forever_out log for " + cpuId);
console.log(err);
}
// else
// console.log("info","Forever Log file saved for player : "+cpuId);
})
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/server-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ exports.deploy = function (installation,group, cb) {
var syncPath = path.join(config.syncDir, installation, group.name),
mediaPath = path.join(config.mediaDir);
fs.mkdir(syncPath, function (err) {
console.log("created directory: "+syncPath+","+err)
//console.log("created directory: "+syncPath)
var filesNotPresent = []
async.eachSeries(group.assets,
function (file, iterative_cb) {
Expand Down
12 changes: 7 additions & 5 deletions public/app/partials/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,17 @@ <h4>Installation Settings</h4>
<div class="form-group">
<div class="checkbox">
<label class="col-xs-8 col-xs-offset-4">
<input type="password" name="sshPassword" ng-model="settings.sshPassword" ng-click="saveSettings()"/><span>SSH Password</span>
<input type="checkbox" name="logs" ng-model="settings.enableLog" ng-change="saveSettings()"/><span translate="translate" class="text-warning">Enable log for file play count/details (network intensive, do not enable unless you need it!)</span>
</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<label class="col-xs-8 col-xs-offset-4">
<input type="checkbox" name="logs" ng-model="settings.enableLog" ng-change="saveSettings()"/><span translate="translate" class="text-warning">Enable log for file play count/details (network intensive, do not enable unless you need it!)</span>
</label>
<label class="col-xs-4 control-label">SSH Password</label>
<div class="col-xs-2">
<input type="password" name="sshPassword" ng-model="settings.sshPassword"/>
</div>
<div class="col-xs-2">
<button type="submit" ng-click="saveSettings()" class="btn btn-success"> Save</button>
</div>
</div>
<!--.form-group
Expand Down
12 changes: 6 additions & 6 deletions public/app/partials/settings.jade
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@
input(type='checkbox',name='forcetvon', ng-model='settings.forceTvOn', ng-click="saveSettings()")
span Keep TV on by sending CEC tv-on message every 3 minutes

.form-group
.checkbox
label.col-xs-8.col-xs-offset-4
input(type='password',name='sshPassword', ng-model='settings.sshPassword', ng-click="saveSettings()")
span SSH Password

.form-group
.checkbox
label.col-xs-8.col-xs-offset-4
input(type='checkbox',name='logs', ng-model='settings.enableLog', ng-change="saveSettings()")
span.text-warning(translate) Enable log for file play count/details (network intensive, do not enable unless you need it!)

.form-group
label.col-xs-4.control-label SSH Password
.col-xs-2
input(type='password',name='sshPassword', ng-model='settings.sshPassword')
.col-xs-2
button.btn.btn-success(type='submit', ng-click='saveSettings()') Save

//.form-group
.checkbox
Expand Down

0 comments on commit ed30f13

Please sign in to comment.