junkie 0.0.11 → 0.0.12

data/lib/junkie/pyload/observer.rb

@@ -11,6 +11,7 @@ module Junkie
 
       DEFAULT_CONFIG = {
           watchdog_refresh: 10,          # interval the watchdog_timer is fired
+          dont_add_episodes_to_queue: false,
       }
 
       def initialize(channels)
@@ -27,13 +28,13 @@ module Junkie
         @ready_for_new_links = true
         @watchdog_enabled = false
         @skipped_timer_at_first_complete_detection = false
+        @should_stat_queued_episodes = false
 
         @channels[:episodes].subscribe do |episode|
           next unless episode.status == :found
 
           log.info("Got episode from Channel: #{episode}")
           @found_episodes.push(episode)
-          stat_queued_episodes
         end
       end
 
@@ -51,7 +52,14 @@ module Junkie
         EM.add_periodic_timer(@config[:watchdog_refresh]) do
           monitor_progress if @watchdog_enabled
 
-          in_fiber { add_next_episode_to_pyload }
+          if @should_stat_queued_episodes
+            stat_queued_episodes
+            @should_stat_queued_episodes = false
+          end
+
+          if not @config[:dont_add_episodes_to_queue]
+            in_fiber { add_next_episode_to_pyload }
+          end
         end
       end
 
@@ -91,7 +99,8 @@ module Junkie
         @channels[:info].push({
           key: "Pending episodes",
           desc: "Number of episodes queued for download",
-          value: @found_episodes.size
+          value: @found_episodes.size,
+          additional: @found_episodes.map { |e| e.to_s }
         })
       end
 

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/junkie/webinterface/public/js/index.js

@@ -0,0 +1,73 @@
+function format_stat(stat, internal_page_id) {
+    internal_page_id = internal_page_id || ""
+
+    return '<li data-key="' + stat.key + '">' +
+            '<a href="#' + internal_page_id + '" data-ajax="false">' +
+            '<span class="ui-li-heading">' + stat.key +
+            '</span><span class="ui-li-desc">' + stat.desc +
+            '</span><span class="ui-li-count bigger">' + stat.value +
+            '</span></a></li>';
+}
+
+function format_inpage(stat, inpage_id) {
+    var s = $('#_InpageDataTemplate').clone();
+
+    $(s).attr('id', inpage_id);
+    $(s).data('url', inpage_id);
+    $('.header', s).text(stat.key);
+    $(stat.additional).each(function(index, value) {
+        $('.content', s).append('<li>' + value + '</li>');
+    });
+
+    return s;
+}
+
+function addOrUpdateStat(stat) {
+
+    // check if the stat contains additional data that should be
+    // displayed in a sub listview
+    var inpage_id = "";
+    var has_inpage = false;
+
+    if (stat.additional !== undefined) {
+        inpage_id = stat.key.replace(/ /g, '');
+        has_inpage = true;
+    }
+
+    var statHtml = format_stat(stat, inpage_id);
+
+    // add or update the stat in the DOM
+    $('#main_page #data li[data-key="' + stat.key + '"]').remove();
+    $(statHtml).insertAfter('#stats');
+    $('#main_page #data').listview('refresh');
+
+    // add or update the inpage for additional data if available
+    if (has_inpage) {
+        var additionalPageHtml = format_inpage(stat, inpage_id);
+        $('body #' + inpage_id).remove();
+        $('body').append(additionalPageHtml);
+    }
+}
+
+function updateUpdatedAt() {
+    var time = new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1");
+    $("#last_update").text(time);
+}
+
+$(function () {
+    var ws       = new WebSocket('ws://' + window.location.host + window.location.pathname);
+    ws.onopen    = function()  {
+        console.log('websocket opened');
+        $('#connection_status').text('connected');
+    };
+    ws.onclose   = function()  {
+        console.log('websocket closed');
+        $('#connection_status').text('disconnected');
+    };
+    ws.onmessage = function(m) {
+        console.log(m);
+        updateUpdatedAt();
+        var obj = $.parseJSON(m.data);
+        addOrUpdateStat(obj);
+    };
+});

data/lib/junkie/webinterface/views/index.erb

@@ -3,29 +3,28 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>
-        </title>
+        <title>Junkie Webapp</title>
         <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.2.0/jquery.mobile-1.2.0.min.css" />
         <style>
             .bigger {
                 font-size: 100% !important;
             }
         </style>
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js">
-        </script>
-        <script src="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.2.0/jquery.mobile-1.2.0.min.js">
-        </script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.2.0/jquery.mobile-1.2.0.min.js"></script>
+        <script src="/js/index.js"></script>
     </head>
     <body>
-        <!-- Home -->
-        <div data-role="page" id="page1">
+
+        <!-- Main page -->
+        <div data-role="page" id="main_page">
             <div data-theme="a" data-role="header">
                 <h3 id="header_title">
                     Junkie Webapp (<%= @junkie_version %>)
                 </h3>
             </div>
             <div data-role="content">
-                <ul data-role="listview" id="data">
+                <ul data-role="listview" data-inset="true" id="data">
                     <li data-role="list-divider" id="stats">Stats</li>
 
                     <li data-role="list-divider">About</li>
@@ -35,45 +34,16 @@
                 </ul>
             </div>
         </div>
-    </body>
-
-    <script type="text/javascript">
-
-        function format_stat(stat) {
-            return '<li data-key="' + stat.key +
-                   '"><span class="ui-li-heading">' + stat.key +
-                   '</span><span class="ui-li-desc">' + stat.desc +
-                   '</span><span class="ui-li-count bigger">' + stat.value +
-                   '</span></li>';
-        }
-
-        function addOrUpdateStat(stat) {
-            var statHtml = format_stat(stat);
-            $('li[data-key="' + stat.key + '"]').remove();
-            $(statHtml).insertAfter('#stats');
-            $('#data').listview('refresh');
-        }
-
-        function updateUpdatedAt() {
-            var time = new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1");
-            $("#last_update").text(time);
-        }
 
-        $(function () {
-            var ws       = new WebSocket('ws://' + window.location.host + window.location.pathname);
-            ws.onopen    = function()  {
-                console.log('websocket opened');
-                $('#connection_status').text('connected');
-            };
-            ws.onclose   = function()  {
-                console.log('websocket closed');
-                $('#connection_status').text('disconnected');
-            };
-            ws.onmessage = function(m) {
-                updateUpdatedAt();
-                var obj = $.parseJSON(m.data);
-                addOrUpdateStat(obj);
-            };
-        });
-  </script>
+        <!-- Template that is cloned fo all stats that carry additional data-->
+        <div data-role="page" id="_InpageDataTemplate">
+            <div data-theme="b" data-role="header">
+                <h3 class="header"></h3>
+            </div>
+            <div data-role="content">
+                <ul data-role="listview" data-inset="true" class="content">
+                </ul>
+            </div>
+        </div>
+    </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -249,6 +249,7 @@ files:
 - lib/junkie/reactor.rb
 - lib/junkie/version.rb
 - lib/junkie/webinterface/interface.rb
+- lib/junkie/webinterface/public/js/index.js
 - lib/junkie/webinterface/views/index.erb
 - spec/config_spec.rb
 - spec/environment_spec.rb