ibg 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c7a42ae549580fa53bc5595d620cf05438673e5c
+  data.tar.gz: 2bf79c3f8e52b2ccd3f53ccf09b67a2a40ca6baa
+SHA512:
+  metadata.gz: 220bb544b16e09be77167e755ec70ea2c41157fa13982058b52ed92f93e4773849cd2bbd257a22698ac8ffa21f8370da5b9303eda97d337d61e79f0f3771aa05
+  data.tar.gz: 4a91f1bd881076a67a1e21a6c0669d32b399589e5a6c552f92028a38308f8c393d7f27657c79e36d12ea2298e488ec5e0403d226307ab3123381360de9bf0116

data/Dockerfile

@@ -9,6 +9,7 @@ RUN gem install sinatra
 RUN gem install haml
 RUN apt-get install -y make ruby-dev g++
 RUN gem install aws-sdk thin
+RUN gem install bundler rake
 RUN git clone https://github.com/ohac/iceberg.git
 RUN \
   mkdir -p /iceberg/public/css && \
@@ -24,7 +25,7 @@ RUN \
   curl -sO https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.ttf
 EXPOSE 4567
 WORKDIR /iceberg
-CMD rackup -p 4567 -o 0.0.0.0
+CMD bundle exec rackup -p 4567 -o 0.0.0.0
 
 # Build:
 # docker build -t ohac/iceberg .

data/bin/iceberg-sync

@@ -16,14 +16,14 @@ class MultiReader
     @readers << reader
   end
 
-  def read(size = nil)
+  def read(size = nil, outbuf = '')
     rv = ''
     loop do
       reader = @readers[@cur]
       break unless reader
-      s = reader.read(size) # TODO S3
+      s = reader.read(size, outbuf) # TODO S3
       if s
-        rv += s
+        rv << s
         if size
           size -= s.size
           break if size <= 0
@@ -32,6 +32,8 @@ class MultiReader
         @cur += 1
       end
     end
+    outbuf.clear
+    outbuf << rv
     rv.size > 0 ? rv : nil
   end
 

data/ibg.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency 'sinatra'
+  spec.add_dependency 'thin'
   spec.add_dependency 'haml'
   spec.add_dependency 'redis'
   spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'i18n'
 end

data/lib/ibg.rb

@@ -43,6 +43,7 @@ module Iceberg
   IBDB_TRIPCODE_FUND = 'iceberg:tripcode:fund:'
   IBDB_RECENT_PEERS = 'iceberg:recentpeers'
   IBDB_PEERS = 'iceberg:peers'
+  IBDB_SHORT_URL = 'iceberg:shorturl:'
 
   ALGORITHM = 'AES-128-CBC'
   REDIS = if ENV['DB_PORT_6379_TCP_PORT']
@@ -143,13 +144,15 @@ module Iceberg
   end
 
   def self.download(name, filename, hexdigest)
-    ctype, disp = case filename
+    ctype, disp = case filename ? filename.downcase : nil
       when /\.jpg$/ ; ['image/jpeg', 'inline']
       when /\.png$/ ; ['image/png', 'inline']
       when /\.gif$/ ; ['image/gif', 'inline']
       when /\.mp3$/ ; ['audio/mpeg', 'inline']
+      when /\.m4a$/ ; ['audio/mpeg', 'inline']
       when /\.ogg$/ ; ['audio/ogg', 'inline']
-      when /\.flac$/ ; ['audio/flac', 'inline']
+      when /\.flac$/ ; ['audio/x-flac', 'inline']
+      when /\.alac$/ ; ['audio/alac', 'inline']
       when /\.webm$/ ; ['video/webm', 'inline']
       when /\.txt$/ ; ['text/plain', 'inline']
       else ['application/octet-stream', 'attachment']
@@ -182,4 +185,19 @@ module Iceberg
     end
   end
 
+  def self.url2key(url, seconds)
+    key = "%010d" % rand(10000000000)
+    dbkey = IBDB_SHORT_URL + key
+    unless REDIS.exists(dbkey) # TODO retry
+      REDIS.set(dbkey, url)
+      REDIS.expire(dbkey, seconds)
+      key
+    end
+  end
+
+  def self.key2url(key)
+    dbkey = IBDB_SHORT_URL + key
+    REDIS.get(dbkey)
+  end
+
 end

data/lib/ibg/storage.rb

@@ -65,7 +65,7 @@ module Iceberg
     end
 
     # TODO S3 bin/icebergsync.rb
-    def read(size = nil)
+    def read(size = nil, outbuf = '')
       if block_given?
         close
         File.open(@path, 'rb') do |fd|
@@ -77,7 +77,7 @@ module Iceberg
         end
       else
         @fd = File.open(@path, 'rb') unless @fd
-        @fd.read(size)
+        @fd.read(size, outbuf)
       end
     end
 

data/lib/ibg/version.rb

@@ -1,3 +1,3 @@
 module Iceberg
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ibg/web.rb

@@ -6,6 +6,8 @@ require 'nkf'
 require 'fileutils'
 require 'base64'
 require 'json'
+require 'i18n'
+require 'i18n/backend/fallbacks'
 
 module Iceberg
 
@@ -19,6 +21,14 @@ module Iceberg
     FORBIDDEN_CHARS = " #<>:\\/*?\"|&',;`"
 
     enable :sessions
+    enable :logging
+
+    configure do
+      I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+      locales = Dir[File.join(ICEBERG_HOME, 'locales', '*.yml')]
+      I18n.load_path = locales
+      I18n.backend.load_translations
+    end
 
     helpers do
 
@@ -29,6 +39,10 @@ module Iceberg
         haml(template, options)
       end
 
+      def t(text)
+        I18n.t(text)
+      end
+
     end
 
     CONTENT_TYPES = {
@@ -47,9 +61,15 @@ module Iceberg
       end
       content_type CONTENT_TYPES[request_uri], :charset => 'utf-8'
       response.headers['Cache-Control'] = 'no-cache'
+      I18n.locale = session[:locale] || 'ja'
     end
 
     get '/' do
+      locale = params[:locale]
+      if locale
+        I18n.locale = locale
+        session[:locale] = locale
+      end
       filemax = SETTING['local']['filemax']
       recentfiles = REDIS.lrange(IBDB_RECENT, 0, filemax)
       tripcodelist = REDIS.smembers(IBDB_TRIPCODE_SET)
@@ -95,7 +115,7 @@ module Iceberg
         rv[:name] = origname
         session[:uploaded] = rv
       rescue => x
-    p x
+p x
       end
       redirect '/'
     end
@@ -162,15 +182,37 @@ p x
           :exists => o.exists?}
     end
 
+    post '/shorten' do
+      name = params[:name]
+      filename = params[:filename]
+      hexdigest = params[:digest]
+      seconds = params[:seconds]
+      params = hexdigest ? "?digest=#{hexdigest}&filename=#{filename}" : ''
+      url = "/show/#{name}#{params}"
+      key = Iceberg.url2key(url, seconds)
+      haml :shorten, :locals => {:key => key}
+    end
+
+    get '/s/:key' do
+      key = params[:key]
+      url = Iceberg.key2url(key)
+      redirect url if url
+      sleep 1 # TODO bruteforce attack
+      raise
+    end
+
     get '/container/:name' do
       name = params[:name]
       hexdigest = params[:digest]
-      haml :container, :locals => { :name => name, :hexdigest => hexdigest }
+      filename = params[:filename]
+      haml :container, :locals => { :name => name, :hexdigest => hexdigest,
+          :filename => filename }
     end
 
     ['/download/:name', '/api/v1/download/:name'].each do |path|
       get path do
         name = params[:name]
+        name = name.split('.')[0] if name.index('.')
         filename = params[:filename]
         hexdigest = params[:digest]
         ctype, disp, file, cipher = Iceberg.download(name, filename, hexdigest)
@@ -184,18 +226,87 @@ p x
           response.headers['Content-Disposition'] =
               "#{disp}; filename=\"#{filename}\""
         end
-        stream do |out|
+        range = request.env['HTTP_RANGE']
+        skip = 0
+        size = nil
+        if range
+          range = range.split('=')[1].split('-').map(&:to_i)
+          size = range[1]
+          if size
+            skip = range[0]
+            size = size + 1 - skip
+            status 206
+          end
+        end
+        if size && size < 4 * 1024 * 1024 # TODO under 4 MiB
+          out = ''
           begin
             file.read do |data|
               data = cipher.update(data) if cipher
               out << data
-              sleep 0.1 # TODO
             end
-            out << cipher.final if cipher
+            if cipher
+              data = cipher.final
+              out << data
+            end
           rescue => x
 p x
           end
           Iceberg.recordip(request.ip)
+          response.headers['Content-Range'] = "bytes #{range.join('-')}/#{out.size}"
+          out[skip, size]
+        else
+          stream do |out|
+            begin
+              file.read do |data|
+                data = cipher.update(data) if cipher
+                if skip <= 0
+                  if size
+                    if size > 0
+                      out << data[0, size]
+                      size -= data.size
+                    end
+                  else
+                    out << data
+                  end
+                else
+                  if skip >= data.size
+                    skip -= data.size
+                  else
+                    if size
+                      out << data[skip, size]
+                      size -= data.size - skip
+                    else
+                      out << data[(skip)..-1]
+                    end
+                    skip = 0
+                  end
+                end
+                sleep 0.1 # TODO
+              end
+              if cipher
+                data = cipher.final
+                if skip <= 0
+                  if size
+                    if size > 0
+                      out << data[0, size]
+                    end
+                  else
+                    out << data
+                  end
+                else
+                  if size
+                    out << data[skip, size]
+                  else
+                    out << data[(skip)..-1]
+                  end
+                end
+              end
+            rescue => x
+p x
+            end
+            Iceberg.recordip(request.ip)
+          end
         end
       end
     end

data/locales/en.yml

@@ -0,0 +1,40 @@
+en:
+  online_storage: Oneline Storage - Iceberg
+  home: Home
+  source: Source
+  roadmap: Roadmap
+  upload: Upload
+  download: Download
+  recent_peers: Recent Peers
+  cryptographic_keys: Cryptographic Keys
+  cryptographic_keys_note1: "All keys are stored on your browser's storage."
+  cryptographic_keys_note2: "It is important to backup keys."
+  file: File
+  text: Text
+  step1: STEP 1
+  step2: STEP 2
+  tripcode_tag: Tripcode Tag (Option)aaa
+  tripcode: 'Tripcode:'
+  up_to_size: 'Up to %s MiB.'
+  trip_key: Trip Key
+  files: Files
+  tags: Tags
+  show_keys: Show Keys
+  import_keys: Import Keys
+  forget_all_keys: Forget All Keys
+  files_in_fifo: '%s / %s files in FIFO.'
+  carousel11: 'Your stuff, anywhere'
+  carousel12: 'You can share pictures, recordings, videos – anything.'
+  carousel13: 'You can quickly share URL to view, download, and collaborate on all the files you want - no email attachment needed.'
+  demo: Demo
+  carousel21: 'Safe and secure'
+  carousel22: 'Full SSL communication. Use Amazon S3.'
+  carousel23: "Everything's automatically private, so you control who sees what."
+  carousel24: 'Server does not store your AES encryption key.'
+  carousel25: "Storing it into your browser's local storage."
+  carousel31: 'Open source'
+  carousel32: 'Iceberg is open source software.'
+  carousel33: 'You can improve this software. Run anywhere.'
+  carousel41: 'Decentralized'
+  carousel42: 'It is possible to download and upload encrypted files via API.'
+  carousel43: 'Anybody can duplicate and re-upload files.'

data/locales/ja.yml

@@ -0,0 +1,40 @@
+ja:
+  online_storage: オンラインストレージ - Iceberg
+  home: ホーム
+  source: ソースコード
+  roadmap: ロードマップ
+  upload: アップロード
+  download: ダウンロード
+  recent_peers: 最近のピア
+  cryptographic_keys: 暗号化鍵
+  cryptographic_keys_note1: すべての鍵はあなたのブラウザに保存されています。
+  cryptographic_keys_note2: 鍵をバックアップしておくことをおすすめします。
+  file: ファイル
+  text: テキスト
+  step1: ステップ1
+  step2: ステップ2
+  tripcode_tag: トリップタグ(オプション)
+  tripcode: 'トリップ:'
+  up_to_size: '最大 %s MiBまで'
+  trip_key: トリップ鍵
+  files: ファイル
+  tags: タグ
+  show_keys: 鍵を見る
+  import_keys: 鍵を取り込む
+  forget_all_keys: すべての鍵を削除
+  files_in_fifo: '%s / %s ファイルがFIFOに存在'
+  carousel11: 'すべてのファイルをどこからでも'
+  carousel12: '写真、音楽、動画など、何でも保管しておけます。'
+  carousel13: 'メール添付不要。アドレス共有で閲覧やダウンロードが可能に。'
+  demo: サンプルファイル
+  carousel21: '安全で安心'
+  carousel22: '通信経路はSSLで暗号化。ファイルはAmazon S3に冗長保存。'
+  carousel23: "ファイルは共有なしで保存され、後で選択できます。"
+  carousel24: 'AES暗号化鍵はサーバには保存しません。'
+  carousel25: "ブラウザの内部ストレージに保存されます。"
+  carousel31: 'オープンソース'
+  carousel32: 'Icebergはオープンソースソフトウェアです。'
+  carousel33: '誰でもこのソフトを改良することができ、どこでも動かせます。'
+  carousel41: '分散システム'
+  carousel42: '暗号化ファイルはAPIでダウンロード・アップロードが可能です。'
+  carousel43: '誰でもファイルの冗長化に参加することができます。'

data/public/show.js

@@ -6,4 +6,24 @@ $(function(){
     localStorage.setItem(encdigest + ':name', name);
     localStorage.setItem(encdigest + ':digest', digest);
   }
+  $('#apply').click(function () {
+    var textdata = $('#textdata');
+    if (textdata) {
+      //var metadata = textdata.contents()[0].body.innerHTML;
+      var metadata = $('pre', textdata.contents()).text(); // TODO Chrome only?
+      $(metadata.split('\n')).each(function (i, x) {
+        var kv = x.split('=');
+        var k = kv[0];
+        var v = kv[1];
+        if (v) {
+          if (v.length == 0) {
+            localStorage.removeItem(k);
+          }
+          else {
+            localStorage.setItem(k, v);
+          }
+        }
+      });
+    }
+  });
 });

data/views/_navbar.haml

@@ -1,9 +1,18 @@
 %li.active
-  %a{:href => "#"} Home
+  %a{:href => "#"}= t 'home'
 %li
   - demourl = Iceberg::SETTING['local']['demourl'] || '#'
-  %a{:href => demourl} Demo
+  %a{:href => demourl}= t 'demo'
 %li
-  %a{:href => 'https://github.com/ohac/iceberg'} Source
+  %a{:href => 'https://github.com/ohac/iceberg'}= t 'source'
 %li
-  %a{:href => 'https://github.com/ohac/iceberg/wiki'} Roadmap
+  %a{:href => 'https://github.com/ohac/iceberg/wiki'}= t 'roadmap'
+%li{:class => 'dropdown'}
+  %a{:href => '#', :class => 'dropdown-toggle', 'data-toggle' => 'dropdown', :role => 'button', 'aria-expanded' => false}
+    Locale
+    %span{:class => 'caret'}
+  %ul{:class => 'dropdown-menu', :role => 'menu', 'aria-labelledby' => 'dropdownMenu1'}
+    %li{:role => 'presentation'}
+      %a{:role => 'menuitem', :tabindex => -1, :href => '/?locale=en'} English
+    %li{:role => 'presentation'}
+      %a{:role => 'menuitem', :tabindex => -1, :href => '/?locale=ja'} 日本語

data/views/container.haml

@@ -1,8 +1,11 @@
+!!! 5
 %html
   %body
+    %br
     - params = "?digest=#{hexdigest}"
+    - name += ".#{filename}" if filename
     - url = "#{name}#{params}"
     - dllink = "/download/#{url}"
     %audio{:controls => :controls}
-      %source{:src => dllink, :type => 'audio/mp3'}
+      %source{:src => dllink, :type => 'audio/mpeg'}
       Your browser does not support audio

data/views/index.haml

@@ -1,7 +1,8 @@
 !!! 5
+- title = Time.now.strftime('%Y-%m-%d %H:%M ')
 %html
   %head
-    %title Online Storage - Iceberg
+    %title= t 'online_storage'
     %meta{:property => 'twitter:card', :content => 'summary'}
     %meta{:name => 'twitter:title', :content => 'Online Storage - Iceberg'}
     %meta{:name => 'twitter:description',
@@ -24,7 +25,7 @@
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          %a.navbar-brand{:href => "#"} Online Storage - Iceberg
+          %a.navbar-brand{:href => "#"}= t 'online_storage'
         %div#navbar{:class => "collapse navbar-collapse"}
           %ul{:class => "nav navbar-nav"}= partial :navbar
     %div.container
@@ -50,7 +51,7 @@
               = name
             - if tripcode
               %br
-              Tripcode:
+              = t 'tripcode'
               %a{:href => "/tripcode/#{tripcode}"}= tripcode
               %input#tripcode{:type => :hidden, :value => tripcode}
 
@@ -65,37 +66,37 @@
               %img{:src => "data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", :alt => "First slide"}
               %div{:class => "container"}
                 %div{:class => "carousel-caption"}
-                  %h1 Your stuff, anywhere
-                  %p You can share pictures, recordings, videos – anything.
-                  %p You can quickly share URL to view, download, and collaborate on all the files you want - no email attachment needed.
+                  %h1= t 'carousel11'
+                  %p= t 'carousel12'
+                  %p= t 'carousel13'
                   %p
                     - demourl = Iceberg::SETTING['local']['demourl'] || '#'
-                    %a{:class => "btn btn-lg btn-primary", :href => demourl} Demo
+                    %a{:class => "btn btn-lg btn-primary", :href => demourl}= t 'demo'
             %div{:class => "item"}
               %img{:src => "data:image/gif;base64,R0lGODlhAQABAIAAAGZmZgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", :alt => "Second slide"}
               %div{:class => "container"}
                 %div{:class => "carousel-caption"}
-                  %h1 Safe and secure
-                  %p Full SSL communication. Use Amazon S3.
-                  %p Everything's automatically private, so you control who sees what.
-                  %p Server does not store your AES encryption key.
-                  %p Storing it into your browser's local storage.
+                  %h1= t 'carousel21'
+                  %p= t 'carousel22'
+                  %p= t 'carousel23'
+                  %p= t 'carousel24'
+                  %p= t 'carousel25'
             %div{:class => "item"}
               %img{:src => "data:image/gif;base64,R0lGODlhAQABAIAAAFVVVQAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", :alt => "Third slide"}
               %div{:class => "container"}
                 %div{:class => "carousel-caption"}
-                  %h1 Open source
-                  %p Iceberg is open source software.
-                  %p You can improve this software. Run anywhere.
+                  %h1= t 'carousel31'
+                  %p= t 'carousel32'
+                  %p= t 'carousel33'
                   %p
                     %a{:class => "btn btn-lg btn-primary", :href => 'https://github.com/ohac/iceberg'} GitHub
             %div{:class => "item"}
               %img{:src => "data:image/gif;base64,R0lGODlhAQABAIAAAFVVVQAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", :alt => "slide 4"}
               %div{:class => "container"}
                 %div{:class => "carousel-caption"}
-                  %h1 Decentralized
-                  %p It is possible to download and upload encrypted files via API.
-                  %p Anybody can duplicate and re-upload files.
+                  %h1= t 'carousel41'
+                  %p= t 'carousel42'
+                  %p= t 'carousel43'
                   %p
                     %a{:class => "btn btn-lg btn-primary", :href => 'https://github.com/ohac/iceberg'} GitHub
           %a{:class => "left carousel-control", :href => "#myCarousel", :role => "button", 'data-slide' => "prev"}
@@ -105,42 +106,42 @@
             %span{:class => "glyphicon glyphicon-chevron-right", 'aria-hidden' => true}
             %span{:class => "sr-only"} Next
 
-        %h1 Upload
+        %h1= t 'upload'
         %ul#uploadtabs{:class => 'nav nav-tabs'}
           %li.active{:role => 'presentation'}
             %a{:href => '#filetab', 'aria-controls' => 'filetab', :role => :tab,
                 'data-toggle' => 'tab'}
               %span{:class => 'glyphicon glyphicon-paperclip',
                 'aria-hidden' => true}
-              File
+              = t 'file'
           %li{:role => 'presentation'}
             %a{:href => '#texttab', 'aria-controls' => 'texttab', :role => :tab,
                 'data-toggle' => 'tab'}
               %span{:class => 'glyphicon glyphicon-pencil',
                 'aria-hidden' => true}
-              Text
+              = t 'text'
         %div{:class => 'tab-content'}
           %div#filetab{:role => :tabpanel, :class => 'tab-pane active'}
 
             %form{:action => '/upload', :method => 'post',
                 :enctype => 'multipart/form-data'}
               %br
-              %label STEP 1
+              %label= t 'step1'
               %br
               %input{:type => 'file', :name => 'file'}
-              Up to #{maxfilesize / (1024 * 1024)} MiB.
+              = (t 'up_to_size') % (maxfilesize / (1024 * 1024))
               %br
               %br
-              %label STEP 2
+              %label= t 'step2'
               %br
               %button{:type => 'submit',
                   :class => 'btn btn-lg btn-default'}
                 %span{:class => 'glyphicon glyphicon-cloud-upload',
                     'aria-hidden' => true}
-                Upload
+                = t 'upload'
               %br
               %br
-              %label Tripcode Tag (Option)
+              %label= t 'tripcode_tag'
               %br
               %div{:class => 'input-group'}
                 %span{:class => 'input-group-addon', :id => 'basic-addon1'}
@@ -148,32 +149,31 @@
                     'aria-hidden' => true}
                   \#
                 %input{:type => :text, :class => 'form-control',
-                    :placeholder => 'Trip Key',
+                    :placeholder => (t 'trip_key'),
                     'aria-describedby' => 'basic-addon1', :name => 'tripkey'}
 
           %div#texttab{:role => :tabpanel, :class => 'tab-pane'}
             %form{:action => '/uploadtext', :method => 'post',
                 :enctype => 'multipart/form-data'}
               %br
-              %label STEP 1
+              %label= t 'step1'
               %br
-              - title = Time.now.strftime('%Y-%m-%d %H:%M ')
               %input{:type => 'input', :name => 'title', :value => title,
                   :class => 'form-control'}
               %br
               %textarea{:rows => 10, :cols => 40, :name => 'text',
                   :class => 'form-control'}
               %br
-              %label STEP 2
+              %label= t 'step2'
               %br
               %button{:type => 'submit',
                   :class => 'btn btn-lg btn-default'}
                 %span{:class => 'glyphicon glyphicon-cloud-upload',
                     'aria-hidden' => true}
-                Upload
+                = t 'upload'
               %br
               %br
-              %label Tripcode Tag (Option)
+              %label= t 'tripcode_tag'
               %br
               %div{:class => 'input-group'}
                 %span{:class => 'input-group-addon', :id => 'basic-addon2'}
@@ -181,24 +181,24 @@
                     'aria-hidden' => true}
                   \#
                 %input{:type => :text, :class => 'form-control',
-                    :placeholder => 'Trip Key',
+                    :placeholder => (t 'trip_key'),
                     'aria-describedby' => 'basic-addon2', :name => 'tripkey'}
 
         %hr
-        %h1 Download
+        %h1= t 'download'
         %ul#downloadtabs{:class => 'nav nav-tabs'}
           %li.active{:role => 'presentation'}
             %a{:href => '#dltab', 'aria-controls' => 'dltab', :role => :tab,
                 'data-toggle' => 'tab'}
               %span{:class => 'glyphicon glyphicon-file',
                 'aria-hidden' => true}
-              Files
+              = t 'files'
           %li{:role => 'presentation'}
             %a{:href => '#tagtab', 'aria-controls' => 'tagtab', :role => :tab,
                 'data-toggle' => 'tab'}
-              %span{:class => 'glyphicon glyphicon-tag',
+              %span{:class => 'glyphicon glyphicon-tags',
                 'aria-hidden' => true}
-              Tags
+              = t 'tags'
         %br
         %div{:class => 'tab-content'}
           %div#dltab{:role => :tabpanel, :class => 'tab-pane active'}
@@ -207,39 +207,61 @@
               %div
                 %a.files{:href => "/show/#{file}", :id => file}= filename
             %br
-            #{recentfiles.size} / #{filemax} files in FIFO.
+            = (t 'files_in_fifo') % [recentfiles.size, filemax]
           %div#tagtab{:role => :tabpanel, :class => 'tab-pane'}
             - tripcodelist.each do |tripcode|
               %div
                 %a.tripcodelist{:href => "/tripcode/#{tripcode}",
                     :id => tripcode}= tripcode
         %hr
-        %h1 Recent Peers
+        %h1= t 'recent_peers'
         - salt = Iceberg::SETTING['local']['salt'] || ''
         - recentpeers.each do |digest, info|
           %p #{digest} (#{info})
         %hr
-        %h1 Cryptographic Keys
-        All keys are stored on your browser's storage.
-        %br
-        It is important to backup keys.
+        %h1= t 'cryptographic_keys'
+        = t 'cryptographic_keys_note1'
         %br
-        %textarea#metadata{:class => 'form-control', :rows => 10}
+        = t 'cryptographic_keys_note2'
         %br
-        %button#showkeys{:type => 'button', :class => 'btn btn-lg btn-default'}
-          %span{:class => 'glyphicon glyphicon-open',
-              'aria-hidden' => true}
-          Show Keys
-        %button#apply{:type => 'button', :class => 'btn btn-lg btn-default'}
-          %span{:class => 'glyphicon glyphicon-save',
-              'aria-hidden' => true}
-          Import Keys
+        %form{:action => '/uploadtext', :method => 'post',
+            :enctype => 'multipart/form-data'}
+          %textarea#metadata{:class => 'form-control', :rows => 10,
+              :name => 'text'}
+          %br
+          %button#showkeys{:type => 'button', :class => 'btn btn-lg btn-default'}
+            %span{:class => 'glyphicon glyphicon-open',
+                'aria-hidden' => true}
+            = t 'show_keys'
+          %button#apply{:type => 'button', :class => 'btn btn-lg btn-default'}
+            %span{:class => 'glyphicon glyphicon-save',
+                'aria-hidden' => true}
+            = t 'import_keys'
+          %input{:type => :hidden, :name => 'title', :value => "#{title}Keys",
+              :class => 'form-control'}
+          %button{:type => 'submit',
+              :class => 'btn btn-lg btn-default'}
+            %span{:class => 'glyphicon glyphicon-cloud-upload',
+                'aria-hidden' => true}
+            = t 'upload'
+          %br
+          %br
+          %label= t 'tripcode_tag'
+          %br
+          %div{:class => 'input-group'}
+            %span{:class => 'input-group-addon', :id => 'basic-addon2'}
+              %span{:class => 'glyphicon glyphicon-tag',
+                'aria-hidden' => true}
+              \#
+            %input{:type => :text, :class => 'form-control',
+                :placeholder => (t 'trip_key'),
+                'aria-describedby' => 'basic-addon2', :name => 'tripkey'}
         %br
         %br
         %button#deleteall{:type => 'button',
             :class => 'btn btn-sm btn-default'}
           %span{:class => 'glyphicon glyphicon-trash', 'aria-hidden' => true}
-          Forget All Keys
+          = t 'forget_all_keys'
     %script{:type => 'text/javascript', :src => '/jquery-2.1.3.min.js'}
     %script{:type => 'text/javascript', :src => "#{cdn}/js/bootstrap.min.js"}
     %script{:type => 'text/javascript', :src => '/bootstrap-filestyle.min.js'}

data/views/shorten.haml

@@ -0,0 +1,35 @@
+!!! 5
+%html
+  %head
+    %title #{key} - Online Storage - Iceberg
+    %link{:href => "/style.css", :rel => "stylesheet", :type => "text/css",
+        :media => "screen"}
+    - cdn = Iceberg::SETTING['local']['cdn'] || ''
+    %link{:href => "#{cdn}/css/bootstrap.min.css", :rel => "stylesheet"}
+    %link{:href => "#{cdn}/css/bootstrap-theme.min.css", :rel => "stylesheet"}
+    %link{:href => "/starter-template.css", :rel => "stylesheet"}
+  %body
+    %nav{:class => "navbar navbar-inverse navbar-fixed-top"}
+      %div.container
+        %div.navbar-header
+          %button{:type => "button", :class => "navbar-toggle collapsed",
+              "data-toggle" => "collapse", "data-target" => "#navbar",
+              "aria-expanded" => "false", "aria-controls" => "navbar"}
+            %span.sr-only Toggle navigation
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.navbar-brand{:href => "/"} Online Storage - Iceberg
+        %div#navbar{:class => "collapse navbar-collapse"}
+          %ul{:class => "nav navbar-nav"}= partial :navbar
+    %div.container
+      %div.starter-template
+        - hostport = 'https://' + request.host
+        - shortlink = "/s/#{key}"
+        - url = "#{hostport}#{shortlink}"
+        %div{:class => 'input-group input-group-lg'}
+          %input{:type => :text, :class => 'form-control', :value => url}
+          %span{:class => "input-group-btn"}
+            %a{:href => shortlink, :class => 'btn btn-default'} Go!
+    %script{:type => 'text/javascript', :src => '/jquery-2.1.3.min.js'}
+    %script{:type => 'text/javascript', :src => "#{cdn}/js/bootstrap.min.js"}

data/views/show.haml

@@ -7,7 +7,10 @@
   -# hostport = request.scheme + '://' + request.host
   - hostport = 'https://' + request.host
   - params = hexdigest ? "?digest=#{hexdigest}&filename=#{filename}" : ''
-  - url = "#{name}#{params}"
+  - url1 = "#{name}#{params}"
+  - dllink1 = "/download/#{url1}"
+  - name2 = filename ? name + ".#{filename}" : name
+  - url = "#{name2}#{params}"
   - dllink = "/download/#{url}"
   - ctlink = "/container/#{url}"
   %head
@@ -15,14 +18,14 @@
     - if exists
       %meta{:name => 'twitter:title', :content => filename}
       - summary = true
-      - case filename
+      - case filename.downcase
         - when /\.jpg$/, /\.gif$/, /\.png$/
           - if filesize < 1024 * 1024
             %meta{:property => 'twitter:card', :content => 'photo'}
             %meta{:name => 'twitter:image', :content => "#{hostport}#{dllink}"}
             %meta{:name => 'twitter:url', :content => request.url}
             - summary = false
-        - when /\.mp3$/
+        - when /\.mp3$/, /\.m4a$/
           %meta{:property => 'twitter:card', :content => 'player'}
           %meta{:name => 'twitter:player', :content => "#{hostport}#{ctlink}"}
           %meta{:name => 'twitter:player:width', :content => 300}
@@ -62,9 +65,9 @@
           %input#digest{:type => :hidden, :value => hexdigest}
           %input#encdigest{:type => :hidden, :value => encdigest}
         - if exists
-          - case filename
+          - case filename.downcase
             - when /\.txt$/
-              %iframe{:src => dllink}
+              %iframe#textdata{:src => dllink, :width => 1024, :height => 360}
               %hr
             - when /\.webm$/
               %video{:width => 640, :height => 360, :controls => :controls}
@@ -73,21 +76,37 @@
             - when /\.jpg$/, /\.gif$/, /\.png$/
               %img{:src => dllink}
               %hr
-            - when /\.mp3$/, /\.ogg$/, /\.flac$/
-              %audio{:src => dllink, :controls => :controls}
+            - when /\.mp3$/, /\.ogg$/, /\.flac$/, /\.m4a$/
+              %audio{:controls => :controls}
+                %source{:src => dllink, :type => 'audio/mpeg'}
               %hr
-          %a{:href => dllink, :class => 'btn btn-default btn-lg'}
-            %span{:class => 'glyphicon glyphicon-cloud-download'} Download
+          %form{:action => '/shorten', :method => 'post'}
+            %a{:href => dllink, :class => 'btn btn-default btn-lg'}
+              %span{:class => 'glyphicon glyphicon-cloud-download'} Download
+            %input{:type => :hidden, :name => :name, :value => name}
+            %input{:type => :hidden, :name => :filename, :value => filename}
+            %input{:type => :hidden, :name => :digest, :value => hexdigest}
+            %input{:type => :hidden, :name => :seconds, :value => 60}= # TODO
+            %button{:type => :submit, :class => 'btn btn-lg btn-default'}
+              %span{:class => 'glyphicon glyphicon-share',
+                  'aria-hidden' => true}
+              Shorten URL (60 seconds)
+            - if /_Keys\.txt$/ === filename
+              %button#apply{:type => 'button',
+                  :class => 'btn btn-lg btn-default'}
+                %span{:class => 'glyphicon glyphicon-save',
+                    'aria-hidden' => true}
+                Import Keys
         - else
           %p File not found
         %hr
         %label Share URL:
         %textarea{:rows => 2, :class => 'form-control'}
-          #{hostport}/show/#{url}
+          #{hostport}/show/#{url1}
         %br
         %label Direct URL:
         %textarea{:rows => 2, :class => 'form-control'}
-          #{hostport}#{dllink}
+          #{hostport}#{dllink1}
     %script{:type => 'text/javascript', :src => '/jquery-2.1.3.min.js'}
     %script{:type => 'text/javascript', :src => "#{cdn}/js/bootstrap.min.js"}
     %script{:type => 'text/javascript', :src => '/show.js'}

metadata

@@ -1,110 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: ibg
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - OHASHI Hideya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Decenterized file storage
@@ -116,8 +131,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Dockerfile
 - Gemfile
 - LICENSE.txt
@@ -133,6 +148,8 @@ files:
 - lib/ibg/storage.rb
 - lib/ibg/version.rb
 - lib/ibg/web.rb
+- locales/en.yml
+- locales/ja.yml
 - public/bootstrap-filestyle.min.js
 - public/carousel.css
 - public/favicon.ico
@@ -149,32 +166,32 @@ files:
 - views/_navbar.haml
 - views/container.haml
 - views/index.haml
+- views/shorten.haml
 - views/show.haml
 - views/tripcode.haml
 homepage: https://box.sighash.info/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Decenterized file storage
 test_files:
 - test/test_entry.rb