rivendell-import 0.10 → 1.01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rivendell-import (0.10)
+    rivendell-import (1.01)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
@@ -10,7 +10,7 @@ PATH
       httparty (= 0.11.0)
       listen (~> 1.3.1)
       mail
-      rivendell-api (~> 0.0.5)
+      rivendell-api (~> 0.8)
       rivendell-db (~> 0.3)
       sinatra
       sqlite3
@@ -22,20 +22,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.19)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
     arel (3.0.3)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.0.4)
@@ -100,7 +100,7 @@ GEM
     guard-rspec (3.1.0)
       guard (>= 1.8)
       rspec (~> 2.13)
-    httmultiparty (0.3.15)
+    httmultiparty (0.3.16)
       httparty (>= 0.7.3)
       mimemagic
       multipart-post
@@ -117,10 +117,10 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     lumberjack (1.0.9)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.3)
+    mime-types (2.4.3)
     mimemagic (0.2.1)
     multi_json (1.10.1)
     multi_test (0.1.1)
@@ -145,7 +145,7 @@ GEM
       ffi (>= 0.5.0)
     rdoc (4.1.2)
       json (~> 1.4)
-    rivendell-api (0.0.5)
+    rivendell-api (0.8)
       activesupport
       httmultiparty
       null_logger
@@ -175,7 +175,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     slop (3.6.0)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     sshkit (1.5.1)
       colorize
       net-scp (>= 1.1.2)
@@ -184,8 +184,8 @@ GEM
     taglib-ruby (0.7.0)
     thor (0.19.1)
     tilt (1.4.1)
-    trollop (2.0)
-    tzinfo (0.3.41)
+    trollop (2.1.1)
+    tzinfo (0.3.42)
     uuidtools (2.1.5)
     will_paginate (3.0.7)
 

data/examples/config.rb

@@ -41,6 +41,7 @@ Rivendell::Import.config do |config|
 
       cart.clear_cuts!
       cart.find_by_title name
+      cart.cut.description = file.basename
     end
 
     cart.group ||= "TEST"
@@ -48,6 +49,6 @@ Rivendell::Import.config do |config|
     # To delete file when task is completed
     #task.delete_file!
 
-    notify 'alban@tryphon.eu', :by => :email
+    # notify 'alban@tryphon.eu', :by => :email
   end
 end

data/lib/rivendell/import.rb

@@ -1,9 +1,11 @@
 require "rivendell/import/version"
 
 require "null_logger"
+require "active_support/core_ext/enumerable"
+require "active_support/core_ext/hash/except"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/module/delegation"
-require "active_support/core_ext/enumerable"
+require "active_support/hash_with_indifferent_access"
 require 'taglib'
 
 require "rivendell/import/config"

data/lib/rivendell/import/application.rb

@@ -24,6 +24,23 @@ module Rivendell::Import
       tasks.to_json
     end
 
+    def config_loader
+      settings.config_loader
+    end
+
+    def edit_config
+      erb :config, :locals => { :config => config_loader.current_config }
+    end
+
+    get '/config' do
+      edit_config
+    end
+
+    post '/config' do
+      config_loader.save params["config"]
+      edit_config
+    end
+
     def tasks
       Task.order("updated_at DESC")
     end

data/lib/rivendell/import/cart.rb

@@ -70,7 +70,7 @@ module Rivendell::Import
     class Updater
 
       attr_accessor :cart
-      
+
       def initialize(cart)
         @cart = cart
       end
@@ -88,7 +88,7 @@ module Rivendell::Import
             default_title if default_title && empty_title?(current_title)
           end
       end
-      
+
       def update
         begin
           update!
@@ -140,8 +140,8 @@ module Rivendell::Import
 
         if title_with_default or not scheduler_codes.empty?
           Rivendell::Import.logger.debug "Update Cart by DB"
-          current_cart.title = title_with_default
-          current_cart.scheduler_codes = scheduler_codes
+          current_cart.title = title_with_default if title_with_default
+          current_cart.scheduler_codes = scheduler_codes unless scheduler_codes.empty?
           current_cart.save
         end
       end
@@ -167,7 +167,7 @@ module Rivendell::Import
       cut.create
 
       Rivendell::Import.logger.debug "Import #{file.path} in Cut #{cut.number}"
-      xport.import number, cut.number, file.path, import_options
+      xport.import number, cut.number, file.path, import_options.symbolize_keys
       cut.update
     end
 

data/lib/rivendell/import/cli.rb

@@ -97,6 +97,7 @@ module Rivendell::Import
       Rivendell::Import.logger.debug "Start webserver"
 
       Thread.new do
+        Rivendell::Import::Application.set :config_loader, config_loader
         Rivendell::Import::Application.run!
 
         # FIXME we don't see difference between normal quit and start error (EADDRINUSE, ...)
@@ -106,7 +107,7 @@ module Rivendell::Import
     end
 
     def config_loader
-      ConfigLoader.new(config_file, listen_mode?)
+      @config_loader = ConfigLoader.new(config_file, listen_mode?)
     end
 
     def daemonize

data/lib/rivendell/import/config_loader.rb

@@ -13,6 +13,14 @@ module Rivendell::Import
       Kernel.load file
     end
 
+    def current_config
+      ::File.read file
+    end
+
+    def save(config)
+      ::File.write absolute_path, config
+    end
+
     def listen_file
       return unless auto_reload?
 

data/lib/rivendell/import/cut.rb

@@ -7,6 +7,8 @@ module Rivendell::Import
     attr_reader :cart
 
     attr_accessor :number
+    attr_accessor :description, :outcue, :isrc, :isci
+
     attr_accessor :datetime
     attr_accessor :daypart
     attr_accessor :days
@@ -24,7 +26,7 @@ module Rivendell::Import
     end
 
     def attributes
-      %w{datetime daypart days}.inject({}) do |map, attribute|
+      %w{description outcue isrc isci datetime daypart days}.inject({}) do |map, attribute|
         value = send attribute
         map[attribute] = value if value
         map
@@ -48,6 +50,14 @@ module Rivendell::Import
       "%06d_%03d" % [cart.number, number]
     end
 
+    def api_attributes
+      attributes.extract!("description", "outcue", "isrc", "isci").delete_if { |_,v| v.blank? }
+    end
+
+    def api_attributes?
+      api_attributes.present?
+    end
+
     def db_attributes?
       [datetime, daypart, days].any? &:present?
     end
@@ -72,6 +82,10 @@ module Rivendell::Import
 
         db_cut.save
       end
+      if api_attributes?
+        Rivendell::Import.logger.debug "Change Cut #{number} via API #{api_attributes.inspect}"
+        xport.edit_cut cart.number, number, api_attributes
+      end
     end
 
     def datetime=(datetime)

data/lib/rivendell/import/static/codemirror.css

@@ -0,0 +1,309 @@
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+}
+.CodeMirror-scroll {
+  /* Set scrolling behaviour here */
+  overflow: auto;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror div.CodeMirror-cursor {
+  border-left: 1px solid black;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: #7e7;
+}
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+
+.cm-animate-fat-cursor {
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+}
+@-moz-keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+@-webkit-keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+@keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+div.CodeMirror-overwrite div.CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-ruler {
+  border-left: 1px solid #ccc;
+  position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  line-height: 1;
+  position: relative;
+  overflow: hidden;
+  background: white;
+  color: black;
+}
+
+.CodeMirror-scroll {
+  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror */
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+.CodeMirror-sizer {
+  position: relative;
+  border-right: 30px solid transparent;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actuall scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  padding-bottom: 30px;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  white-space: normal;
+  height: 100%;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  padding-bottom: 30px;
+  margin-bottom: -32px;
+  display: inline-block;
+  /* Hack to make IE7 behave */
+  *zoom:1;
+  *display:inline;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+
+.CodeMirror-lines {
+  cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+}
+.CodeMirror-wrap pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+  overflow: auto;
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-wrap .CodeMirror-scroll {
+  overflow-x: hidden;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  visibility: hidden;
+}
+.CodeMirror-measure pre { position: static; }
+
+.CodeMirror div.CodeMirror-cursor {
+  position: absolute;
+  border-right: none;
+  width: 0;
+}
+
+div.CodeMirror-cursors {
+  visibility: hidden;
+  position: relative;
+  z-index: 3;
+}
+.CodeMirror-focused div.CodeMirror-cursors {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+
+.cm-searching {
+  background: #ffa;
+  background: rgba(255, 255, 0, .4);
+}
+
+/* IE7 hack to prevent it from returning funny offsetTops on the spans */
+.CodeMirror span { *vertical-align: text-bottom; }
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursors {
+    visibility: hidden;
+  }
+}
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }