Skip to content

Add a feature to filter out events of specified repos/orgs #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
debugger22 merged 4 commits into from
Oct 7, 2016
Merged

Add a feature to filter out events of specified repos/orgs #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fff14e7
Remove an unused variable
debugger22 Oct 7, 2016
7e51f39
Add ref. to ULTIMATE_DREAM_KILLER
debugger22 Oct 7, 2016
ae5b203
Add a feature to filter out events of specified repos/orgs
debugger22 Oct 7, 2016
c4a763a
Always draw irrespective of screen visibility
debugger22 Oct 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ <h2 class="online-users-text"><span class="odometer online-users-count"></span>
</div>
</div>
<div id="config-area">
<div id="consumption-rate-div">
Set events consumption rate <div id="eventConsumptionSlider"></div>
<div id="org-repo-filter-div">
Enter your organization's or repository's names to filter events&nbsp; <input type="text" id="org-repo-filter-name" placeholder="github google facebook"/>
</div>
<div class="site-description">
<h4>About</h4>
Expand Down
16 changes: 11 additions & 5 deletions app/public/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,23 +155,29 @@ circle {
font-weight: 300;
}

#consumption-rate-div{
#org-repo-filter-div{
width: 50%;
margin: 0 auto;
margin-bottom: 0px;
visibility: hidden;
}

#eventConsumptionSlider{
margin-top: 20px;
width: 300px;
#org-repo-filter-name{
width: 20%;
color: gray;
padding: 5px;
padding-left: 10px;
border: none;
background: #F1F1F1;
font-family: 'Josefin Sans', sans-serif;
font-size: 1em;
}

.site-description{
font-size: 1em;
line-height: 1.6em;
width: 50%;
margin: 0 auto;
margin-top: 50px;
}

footer{
Expand Down
36 changes: 22 additions & 14 deletions app/public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ var drawingArea;
var width;
var height;
var volume = 0.6;
var ULTIMATE_DREAM_KILLER = false;
var ULTIMATE_DREAM_KILLER = false; // https://github.com/debugger22/github-audio/pull/19
var orgRepoFilterNames;

var scale_factor = 6,
note_overlap = 2,
Expand All @@ -22,8 +23,7 @@ var svg_background_color_online = '#0288D1',
pull_request_color = 'rgb(46, 204, 113)',
comment_color = 'rgb(46, 204, 113)'
edit_color = '#fff',
total_sounds = 51,
total_edits = 0;
total_sounds = 51;

var celesta = [],
clav = [],
Expand All @@ -37,7 +37,16 @@ socket.on('github', function (data) {
$('.online-users-count').html(data.connected_users);
data.data.forEach(function(event){
if(!isEventInQueue(event)){
eventQueue.push(event);
// Filter out events only specified by the user
if(orgRepoFilterNames != null && orgRepoFilterNames != []){
// Don't consider pushes to github.io repos when org filter is on
if(new RegExp(orgRepoFilterNames.join("|")).test(event.repo_name)
&& event.repo_name.indexOf('github.io') == -1){
eventQueue.push(event);
}
}else{
eventQueue.push(event);
}
}
});
// Don't let the eventQueue grow more than 1000
Expand Down Expand Up @@ -123,12 +132,6 @@ $(function(){
}
});

$('#eventConsumptionSlider').slider({
'min': 1,
'max': 100
});


// Main drawing area
svg = d3.select("#area").append("svg");
svg.attr({width: width, height: height});
Expand Down Expand Up @@ -192,6 +195,11 @@ $(function(){
// Make header and footer visible
$('body').css('visibility', 'visible');

$('#org-repo-filter-name').on('input', function() {
orgRepoFilterNames = $('#org-repo-filter-name').val().split(' ');
eventQueue = [];
});

});


Expand Down Expand Up @@ -238,8 +246,8 @@ function playFromQueueExchange1(){
var event = eventQueue.shift();
if(event != null && event.message != null && !shouldEventBeIgnored(event) && svg != null){
playSound(event.message.length*1.1, event.type);
if(!document.hidden)
drawEvent(event, svg);
// if(!document.hidden)
drawEvent(event, svg);
}
setTimeout(playFromQueueExchange1, Math.floor(Math.random() * 1000) + 500);
$('.events-remaining-value').html(eventQueue.length);
Expand All @@ -249,8 +257,8 @@ function playFromQueueExchange2(){
var event = eventQueue.shift();
if(event != null && event.message != null && !shouldEventBeIgnored(event) && svg != null){
playSound(event.message.length, event.type);
if(!document.hidden)
drawEvent(event, svg);
// if(!document.hidden)
drawEvent(event, svg);
}
setTimeout(playFromQueueExchange2, Math.floor(Math.random() * 800) + 500);
$('.events-remaining-value').html(eventQueue.length);
Expand Down