ipcam 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93b61fe6e5f73409e2849fef325d17ab2346a1976b42bcc26b8c6101740d4966
-  data.tar.gz: fc43d179a3351208cda3e647dd1f36851a7a587c253e560f1f80f1d813802478
+  metadata.gz: 113a2a9bb9fd4e1a578898654c0a82926abc332d02aea58567e9530ed59b7c37
+  data.tar.gz: fbd86fd23d34fedc6e491bed2d823e03d8f5cc5afd4993a85d1ff3613a203f7f
 SHA512:
-  metadata.gz: d6c0b022dc7022de123b67a291e2f455379e1c3abc322ff4d5752951aa6b024b2f6d8e8d7dca4de58dc40dee6833fc65ffcde79a4063c797e19ae5f9daafba62
-  data.tar.gz: 55533db3f31edd4baa3a7cdd6030acabf7b3d04f3abe1c1bb95c90a3a9754485f5be2c5349d676df59cc30c6838af987b171eab584e4804c4c8df78da247fe8b
+  metadata.gz: 65c5542f695a62cc5f818cc95cf554763eda0d334fea9c36181587fd4e298f49695e205fca21925a92006cba966a2c8e49c569e5e842bd0887f1c3c21aeff7e9
+  data.tar.gz: 4775df55c9a5a3533df89da431b724d7fddd4c86c2f0c259aa15a46ec833d95c5bac960a1959e012f0eafa31650dbc698620b5a7e614f4094b6280748ab44b97

data/README.md

@@ -18,6 +18,7 @@ Or install it yourself as:
     $ gem install ipcam
 
 ## Usage
+Connect a camera device compatible with V4L2 and start ipcam as follows.
 ```
 ipcam [options] [device-file]
 options:
@@ -30,6 +31,11 @@ options:
         --log-level=LEVEL
         --develop-mode
 ```
+Then connect to port 4567 by http browser and operate. The accessible URLs are as follows.
+
+* http://${HOST}:4567/<br>redicrect to /main
+* http://${HOST}:4567/main<br>preview and settings
+* http://${HOST}:4567/stream<br>http streaming
 
 ### options
 <dl>
@@ -55,5 +61,9 @@ options:
 ### device-file
 specify target device file (ex: /dev/video1). if omittedm,  it will use "/dev/video0".
 
+## etc
+### About image data
+いらすとや(https://www.irasutoya.com/)で配布されている『特撮映画のイラスト』(https://www.irasutoya.com/2018/12/blog-post_90.html)を改変して使用しています。
+
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/bin/ipcam

@@ -91,7 +91,6 @@ OptionParser.new { |opt|
 
   opt.order!(ARGV)
 
-
   if log[:device]
     $log_device = File.open(log[:device], "a")
     $log_device.sync = true

data/lib/ipcam/main.rb

@@ -13,6 +13,7 @@ require 'msgpack'
 module IPCam
   BASIS_SIZE = 640 * 480
   Stop       = Class.new(Exception)
+  Restart    = Class.new(Exception)
 
   class << self
     def start
@@ -20,7 +21,7 @@ module IPCam
 
       @mutex   = Mutex.new
       @camera  = nil
-      @state   = :READY
+      @state   = :STOP
       @img_que = Thread::Queue.new
       @cam_thr = Thread.new {camera_thread}
       @snd_thr = Thread.new {sender_thread}
@@ -44,12 +45,7 @@ module IPCam
     end
 
     def restart_camera
-      @cam_thr.raise(Stop)
-      @cam_thr.join
-
-      @img_que.clear
-
-      @cam_thr = Thread.new {camera_thread}
+      @cam_thr.raise(Restart)
     end
 
     def select_capabilities(cam)
@@ -169,8 +165,16 @@ module IPCam
 
     def restore_db
       begin
-        blob  = $db_file.binread
-        @db   = MessagePack.unpack(blob, :symbolize_keys => true)
+        blob = $db_file.binread
+        @db  = MessagePack.unpack(blob, :symbolize_keys => true)
+
+        @db.keys { |bus|
+          @db[bus].keys { |name|
+            @db[bus][name.to_s] = @db[bus].delete(name)
+          }
+
+          @db[bus.to_s] = @db.deleye(bus)
+        }
 
       rescue
         begin
@@ -179,13 +183,13 @@ module IPCam
           # ignore
         end
           
-        @db   = {}
+        @db  = {}
       end
     end
     private :restore_db
 
     def load_settings
-      ret = @db.dig(@camera.bus, @camera.name)
+      ret = @db.dig(@camera.bus.to_sym, @camera.name.to_sym)
 
       if not ret
         ret = create_setting_entry(@camera)
@@ -211,39 +215,62 @@ module IPCam
     end
     private :broadcast
 
+    def change_state(state)
+      flag = @mutex.try_lock
+
+      if @state != state
+        @state = state
+        broadcast(:change_state, state)
+      end
+
+      @mutex.unlock if flag
+    end
+    private :change_state
+
     def camera_thread
       $logger.info("main") {"camera thread start"}
 
-      @mutex.synchronize {
-        @camera = Video4Linux2::Camera.new($target)
+      @camera = Video4Linux2::Camera.new($target)
+      if not @camera.support_formats.any? {|x| x.fcc == "MJPG"}
+        raise("#{$target} is not support Motion-JPEG")
+      end
 
-        if not @camera.support_formats.any? {|x| x.fcc == "MJPG"}
-          raise("#{$target} is not support Motion-JPEG")
-        end
+      begin
+        @mutex.synchronize {
+          @config = load_settings()
 
-        @config = load_settings()
+          @camera.start
+          change_state(:ALIVE)
+        }
 
-        @camera.start
-        @state = :BUSY
-      }
+        loop {
+          @img_que << @camera.capture
+        }
 
-      loop {
-        @img_que << @camera.capture
-      }
+      rescue Stop
+        $logger.info("main") {"accept stop request"}
+        change_state(:STOP)
 
-    rescue Stop
-      $logger.info("main") {"accept stop request"}
-      @state = :READY
+      rescue Restart
+        $logger.info("main") {"restart camera"}
+        @camera.stop
+        retry
+
+      rescue => e
+        change_state(:ABORT)
+        raise(e)
+
+      ensure
+        @camera.stop if (@camera.busy? rescue false)
+      end
 
     rescue => e
       $logger.error("main") {"camera error occured (#{e.message})"}
-      @state = :ABORTED
+      change_state(:ABORT)
 
     ensure
-      @camera&.stop if @camera&.busy?
       @camera&.close
       @camera = nil
-
       $logger.info("main") {"camera thread stop"}
     end
     private :camera_thread
@@ -279,17 +306,17 @@ module IPCam
     end
 
     def get_ident_string
-      raise("state violation") if @state != :BUSY
+      raise("state violation") if @state != :ALIVE
       return "#{@camera.name}@#{@camera.bus}"
     end
 
     def get_config
-      raise("state violation") if @state != :BUSY
+      raise("state violation") if @state != :ALIVE
       return @config
     end
 
     def set_image_size(width, height)
-      raise("state violation") if @state != :BUSY
+      raise("state violation") if @state != :ALIVE
 
       @mutex.synchronize {
         @config[:image_width]  = width
@@ -301,7 +328,7 @@ module IPCam
     end
 
     def set_framerate(num, deno)
-      raise("state violation") if @state != :BUSY
+      raise("state violation") if @state != :ALIVE
 
       @mutex.synchronize {
         @config[:framerate] = [num, deno]
@@ -312,7 +339,7 @@ module IPCam
     end
 
     def set_control(id, val)
-      raise("state violation") if @state != :BUSY
+      raise("state violation") if @state != :ALIVE
 
       entry = nil
 
@@ -328,9 +355,12 @@ module IPCam
     end
 
     def save_config
+      $logger.info('main') {"save config to #{$db_file.to_s}"}
       @mutex.synchronize {
         $db_file.binwrite(@db.to_msgpack)
       }
+
+      broadcast(:save_complete)
     end
 
     def add_client(que)

data/lib/ipcam/version.rb

@@ -1,3 +1,3 @@
 module IPCam
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/ipcam/webserver.rb

@@ -95,6 +95,9 @@ module IPCam
           EOT
 
           port << data
+
+          # データ詰まりを防ぐ為にキューをクリア
+          queue.clean
         }
       end
     end
@@ -104,7 +107,7 @@ module IPCam
       scss name.to_sym, :views => APP_RESOURCE_DIR + "scss"
     end
 
-    get %r{/(css|js|fonts)/(.+)} do |type, name|
+    get %r{/(css|js|img|fonts)/(.+)} do |type, name|
       path = find_resource(type, name)
       
       if path

data/resource/common/js/msgpack-rpc.js

@@ -165,7 +165,7 @@ if (!msgpack) {
         };
 
         this.sock.onclose = () => {
-          if (this.onSessionClosed) this.onSessionClosed();
+          this[callback]('session_closed', []);
           this.sock = null;
         };
       }

data/resource/common/js/util.js

@@ -131,5 +131,15 @@
 
       $text.remove();
     }
+
+    static showAbortShield(html) {
+      $('body').css('overflow', 'hidden');
+
+      $('#abort-shield')
+        .find('p')
+          .html(html)
+        .end()
+        .fadeIn();
+    }
   }
 })();

data/resource/common/scss/abort_shield.scss

@@ -0,0 +1,44 @@
+@charset "UTF-8";
+
+div#abort-shield {
+  display: none;
+  position: fixed;
+	pointer-events: none;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  padding: 20px;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0,0,0,0.6);
+  text-align: center;
+  z-index: 10000;
+
+  div.abort-content {
+    position: absolute;
+    height: fit-content;
+    margin: auto;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    img {
+      text-align: center;
+      filter: blur(0.25px);
+    }
+
+    p {
+      //font-family: Roboto;
+      font-weight: lighter;
+      font-size: 200%;
+      text-align: center;
+    }
+
+    * {
+      color: white;
+    }
+	}
+}

data/resource/common/views/abort_shield.erb

@@ -0,0 +1,6 @@
+<div id="abort-shield" style="display:none;">
+  <div class="abort-content">
+    <img src="/img/kaiju.png"></img>
+    <p id="abort-message"></p>
+  </div>
+</div>

data/resource/ipcam/js/main.js

@@ -18,6 +18,7 @@
   var session;
   var capabilities;
   var controls;
+  var sliders;
 
   var imageWidth;
   var imageHeight;
@@ -30,42 +31,58 @@
    * declar functions
    */
 
-  function setCameraInfo(info) {
+  function setDeviceFile(name) {
+    $('h3#device-file').text(name);
+  }
+
+  function setState(state) {
     var fg;
     var bg;
+    var lb;
 
-    $('h3#device-file').text(info["device"]);
-
-    switch (info["state"]) {
-      case "READY":
+    switch (state) {
+      case "STOP":
       default:
         fg = "royalblue";
         bg = "white";
+        lb = "START";
         break;
 
-      case "BUSY":
-        fg = "gold";
+      case "ALIVE":
+        fg = "springgreen";
         bg = "black";
+        lb = "STOP";
         break;
 
       case "ABORT":
         fg = "crimson";
         bg = "white";
+        lb = "RECOVER";
+        break;
     }
 
+    $('button#action').text(lb);
+
     $('div#state')
       .css('color', fg)
       .css('-webkit-text-stroke', `0.5px ${bg}`)
-      .text(info["state"]);
+      .text(state);
   }
 
-  function setIdentString(str) {
+  function setupScreenSize() {
     var height;
 
-    $('h5#device-name').text(str);
-
     height = $('body').height() - $('div.jumbotron').outerHeight(true);
     $('div#main-area').height(height);
+
+    setTimeout(() => {
+      $('div#preview').getNiceScroll().resize();
+      $('div#config').getNiceScroll().resize();
+    }, 0);
+  }
+
+  function setIdentString(str) {
+    $('h6#device-name').text(str);
   }
 
   function sortCapabilities() {
@@ -113,37 +130,43 @@
     return `${ret} fps`;
   }
 
-  function chooseFramerate(rate) {
-    var info;
+  function findCapability() {
+    var ret;
+
+    ret = capabilities.find((obj) => {
+      return ((obj.width == imageWidth) && (obj.height == imageHeight));
+    });
+
+    return ret;
+  }
+
+  function selectFramerate(rates) {
     var list;
     var targ;
 
-    targ = rate[0] / rate[1];
+    targ = framerate[0] / framerate[1];
 
-    info = capabilities.find((obj) => {
-      return ((obj.width == imageWidth) && (obj.height == imageHeight));
-    });
+    if (!rates) {
+      rates = findCapability()["rate"];
+    }
+
+    list = rates.concat();
 
-    list = info["rate"].reduce((m, n) => {m.push(n); return m}, []);
     list.sort((a, b) => {
       return  Math.abs((a[0] / a[1]) - targ) - Math.abs((b[0] / b[1]) - targ);
     });
 
-    return `${list[0][0]},${list[0][1]}`;
+    $('select#framerate').val(`${list[0][0]},${list[0][1]}`);
   }
 
   function setFramerateSelect() {
     var info;
 
-    /*
-     * フレームレート
-     */
+    $('select#framerate')
+      .empty()
+      .off('change');
 
-    $('select#framerate').empty();
-
-    info = capabilities.find((obj) => {
-      return ((obj.width == imageWidth) && (obj.height == imageHeight));
-    });
+    info = findCapability();
 
     if (info) {
       info["rate"].forEach((obj) => {
@@ -154,8 +177,9 @@
           );
       });
 
+      selectFramerate(info['rate']);
+
       $('select#framerate')
-        .val(chooseFramerate(framerate))
         .on('change', (e) => {;
           let val;
           let res;
@@ -174,8 +198,7 @@
 
     $input = $('<input>')
       .attr('id', `control-${info["id"]}`)
-      .attr('type', 'range')
-      .attr('value', info["value"]);
+      .attr('type', 'range');
 
     $('div#controls')
       .append($('<div>')
@@ -193,17 +216,19 @@
 
     tics = info["max"] - info["min"];
     
-    $input
+    sliders[info["id"]] = $input
       .ionRangeSlider({
-        type:         "single",
-        min:          info["min"],
-        max:          info["max"],
-        step:         info["step"],     
-        skin:         "sharp",
-        keyboard:     true,
-        hide_min_max: true,
-        grid:         true,
-        grid_num:     (tics > 10)? 10: tics,
+        type:               "single",
+        min:                info["min"],
+        max:                info["max"],
+        step:               info["step"],     
+        from:               info["value"],
+        skin:               "sharp",
+        keyboard:           true,
+        hide_min_max:       true,
+        grid:               true,
+        grid_num:           (tics > 10)? 10: tics,
+        prettify_separator: ",",
 
         onFinish: (data) => {
           session.setControl(info["id"], data["from"])
@@ -224,14 +249,17 @@
 
     $('div#controls')
       .append($('<div>')
-        .addClass('pretty p-default my-2')
-        .append($input)
+        .addClass('form-group')
         .append($('<div>')
-          .addClass('state p-primary')
-          .append($('<label>')
-            .addClass('form-label')
-            .attr("for", `control-${info["id"]}`)
-            .text(info["name"])
+          .addClass('pretty p-default my-2')
+          .append($input)
+          .append($('<div>')
+            .addClass('state p-primary')
+            .append($('<label>')
+              .addClass('form-label')
+              .attr("for", `control-${info["id"]}`)
+              .text(info["name"])
+            )
           )
         )
       );
@@ -291,6 +319,8 @@
 
     $('div#controls').append($("<hr>"));
 
+    sliders = {};
+
     info.forEach((entry) => {
       if (entry["type"] == "integer") {
         addIntegerForm(entry);
@@ -302,7 +332,9 @@
     previewCanvas.width  = imageWidth;
     previewCanvas.height = imageHeight;
 
-    $('div#preview').getNiceScroll().resize();
+    setTimeout(() => {
+      $('div#preview').getNiceScroll().resize();
+    }, 0);
   }
 
   function updatePreviewCanvas(img) {
@@ -317,29 +349,122 @@
                         imageHeight);
   }
 
+  function updateImage(data) {
+    Utils.loadImageFromData(data)
+      .then((img) => {
+        updatePreviewCanvas(img);
+      })
+      .fail((error) => {
+        console.log(error);
+      });
+  }
+
+  function updateImageSize(width, height) {
+    imageWidth  = width;
+    imageHeight = height;
+
+    resizePreviewCanvas();
+    setFramerateSelect();
+  }
+
+  function updateFramerate(num, deno) {
+    framerate = [num, deno]
+    selectFramerate();
+  }
+
+  function updateControl(id, val) {
+    var info;
+
+    info = controls.find((obj) => obj["id"] == id);
+
+    switch (info["type"]) {
+    case "boolean":
+      $(`input#control-${id}`).prop('checked', val);
+      break;
+
+    case "integer":
+      $(`input#control-${id}`).data('ionRangeSlider').update({from:val});
+      break;
+
+    case "menu":
+      $(`select#control-${id}`).val(val);
+      break;
+    }
+
+  }
+
+  function changeState(state) {
+    var pr1;
+    var pr2;
+
+    setState(state);
+
+    if (state == "ALIVE") {
+      pr1 = session.getIdentString()
+        .then((str) => {
+          setIdentString(str);
+        });
+
+      pr2 = session.getConfig()
+        .then((info) => {
+          let rates;
+
+          capabilities = info["capabilities"];
+          controls     = info["controls"];
+          imageWidth   = info["image_width"];
+          imageHeight  = info["image_height"];
+          framerate    = info["framerate"];
+
+          resizePreviewCanvas();
+          sortCapabilities();
+          setImageSizeSelect();
+          setFramerateSelect();
+
+          setControlForm(info["controls"]);
+
+          setTimeout(() => {
+            $('div#config').getNiceScroll().resize();
+          }, 0);
+        });
+
+      $.when(pr1, pr2)
+        .done(() => {
+          setupScreenSize();
+        });
+
+    } else {
+      $('h6#device-name').text(null);
+
+      $('select#image-size > option').remove();
+      $('select#framerate > option').remove();
+      $('div#controls').empty();
+
+      setupScreenSize();
+    }
+  }
+
   function startSession() {
     session
       .on('update_image', (data) => {
-        Utils.loadImageFromData(data)
-          .then((img) => {
-            updatePreviewCanvas(img);
-          })
-          .fail((error) => {
-            console.log(error);
-          });
+        updateImage(data);
       })
       .on('update_image_size', (width, height) => {
-        imageWidth  = width;
-        imageHeight = height;
-
-        resizePreviewCanvas();
-        setFramerateSelect();
+        updateImageSize(width, height);
       })
       .on('update_framerate', (num, deno) => {
-        console.log("not implemented yet");
+        updateFramerate(num, deno);
       })
       .on('update_control', (id, val) => {
-        console.log("not implemented yet");
+        updateControl(id, val);
+      })
+      .on('change_state', (state) => {
+        changeState(state);
+      })
+      .on('save_complete', () => {
+        $('#save-complete-toast').toast('show');
+      })
+      .on('session_closed', () => {
+        Utils.showAbortShield("session closed");
       });
 
     session.start()
@@ -347,40 +472,13 @@
         return session.getCameraInfo();
       })
       .then((info) => {
-        setCameraInfo(info);
-
-        if (info["state"] == "BUSY") {
-          session.getIdentString()
-            .then((str) => {
-              setIdentString(str);
-            });
-
-          session.getConfig()
-            .then((info) => {
-              let rates;
-
-              capabilities = info["capabilities"];
-              controls     = info["controls"];
-              imageWidth   = info["image_width"];
-              imageHeight  = info["image_height"];
-              framerate    = info["framerate"];
-
-              sortCapabilities();
-
-              resizePreviewCanvas();
-              setImageSizeSelect();
-              setFramerateSelect();
-
-              setControlForm(info["controls"]);
-
-              $('div#config').getNiceScroll().resize();
-            });
-        }
+        setDeviceFile(info["device"]);
+        changeState(info["state"]);
 
         return session.addNotifyRequest();
       })
       .fail((error) => {
-        console.log(error);
+        Utils.showAbortShield(error);
       });
   }
 
@@ -414,6 +512,7 @@
 
         url = `${location.protocol}//${location.host}/stream`;
         Utils.copyToClipboard(url);
+        $('#url-copied-toast').toast('show');
       });
   }
 
@@ -421,6 +520,7 @@
     session       = new Session(WS_URL);
     capabilities  = null;
     controls      = null;
+    sliders       = null;
     imageWidth    = null;
     imageHeight   = null;
     framerate     = null;
@@ -462,6 +562,11 @@
       });
   });
 
+  $(window)
+  .on('resize', () => {
+    setupScreenSize();
+  });
+
   /* デフォルトではコンテキストメニューをOFF */
   $(document)
     .on('contextmenu', (e) => {

data/resource/ipcam/scss/main/style.scss

@@ -1,9 +1,22 @@
 @charset "UTF-8";
+@import "../../../common/scss/abort_shield.scss";
 
 body {
+  position: relative;
   width: 100%;
   height: 100%;
 
+  div.toast {
+    position: fixed;
+    top: 1.0rem;
+    right: 1.0rem;
+    min-width: 20rem;
+
+    div.toast-body {
+      background-color: lightgray;
+    }
+  }
+
   div.jumbotron {
     padding: 2rem 1rem;
     margin-bottom: 0px;
@@ -12,7 +25,7 @@ body {
       font-weight: bold;
     }
 
-    h5 {
+    h6 {
       font-weight: lighter;
     }
   }

data/resource/ipcam/views/main.erb

@@ -19,14 +19,14 @@
     <div class="jumbotron jumbotron-fluid">
       <div class="container">
         <h3 id="device-file"></h3>
-        <h5 id="device-name"></h3>
+        <h6 id="device-name"></h3>
       </div>
     </div>
 
     <div id="main-area" class="d-flex d-flex-row">
       <div id="switches">
         <div class="form-grounp mt-3">
-          <button class="btn btn-primary" disabled>STOP</button>
+          <button id="action" class="btn btn-primary" disabled>STOP</button>
         </div>
 
         <div class="form-grounp mt-3">
@@ -64,5 +64,9 @@
         </div>
       </div>
     </div>
+
+    <%= render :erb, :"toast/save_complete" %>
+    <%= render :erb, :"toast/url_copied" %>
+    <%= render :erb, :"../../common/views/abort_shield" %>
   </body>
 </html>

data/resource/ipcam/views/toast/save_complete.erb

@@ -0,0 +1,15 @@
+<div id="save-complete-toast" class="toast"
+    data-delay="3000" role="alert" aria-live="assertive" aria-atomic="true">
+  <div class="toast-header">
+    <span class="text-primary">&#x25a0; </span>
+    <strong class="mr-auto">Notice</strong>
+    <button type="button" class="ml-2 mb-1 close"
+        data-dismiss="toast" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="toast-body">
+    Configuration data saved.
+  </div>
+</div>

data/resource/ipcam/views/toast/url_copied.erb

@@ -0,0 +1,15 @@
+<div id="url-copied-toast" class="toast"
+    data-delay="3000" role="alert" aria-live="assertive" aria-atomic="true">
+  <div class="toast-header">
+    <span class="text-primary">&#x25a0; </span>
+    <strong class="mr-auto">Notice</strong>
+    <button type="button" class="ml-2 mb-1 close"
+        data-dismiss="toast" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="toast-body">
+    It had copied streaming URL to clipboard.
+  </div>
+</div>

data/run.sh

@@ -1,3 +1,3 @@
 #! /bin/sh
 
-ruby -Ilib bin/ipcam --develop-mode
+ruby -Ilib bin/ipcam --develop-mode $*

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipcam
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,8 +184,11 @@ files:
 - lib/ipcam/version.rb
 - lib/ipcam/webserver.rb
 - lib/ipcam/websock.rb
+- resource/common/img/kaiju.png
 - resource/common/js/msgpack-rpc.js
 - resource/common/js/util.js
+- resource/common/scss/abort_shield.scss
+- resource/common/views/abort_shield.erb
 - resource/extern/css/bootstrap.min.css
 - resource/extern/css/ion.rangeSlider.min.css
 - resource/extern/css/pretty-checkbox.min.css
@@ -200,6 +203,8 @@ files:
 - resource/ipcam/scss/main/style.scss
 - resource/ipcam/views/main.erb
 - resource/ipcam/views/settings.erb
+- resource/ipcam/views/toast/save_complete.erb
+- resource/ipcam/views/toast/url_copied.erb
 - run.sh
 homepage: https://github.com/kwgt/ipcam
 licenses: