pig-media-server 2 → 100

data/package.json

@@ -1,23 +1,18 @@
 {
   "main": "javascript/main.js",
-  "description": "music",
+  "description": "pig",
   "dependencies": {
-    "react": "",
-    "react-dom": "",
-    "moment": "",
-    "moment-timezone": "",
-    "jquery": ""
-  },
-  "devDependencies": {
-    "browser-sync": "",
-    "browserify": "",
-    "babelify": "",
-    "gulp-webserver": "",
-    "gulp": "3.9.0",
-    "gulp-babel": "",
-    "vinyl-source-stream": "",
-    "vinyl-buffer": "",
-    "babel": "",
-    "gulp-uglify": ""
+    "react": "0.14.7",
+    "react-dom": "0.14.7",
+    "react-router": "2.0.1",
+    "jquery": "2.2.2",
+    "webpack": "1.12.14",
+    "babel-preset-es2016-node5": "1.1.2",
+    "babel-preset-es2015": "6.6.0",
+    "babel-preset-react": "6.5.0",
+    "babel-loader": "6.2.4",
+    "babel-core": "6.7.0",
+    "css-loader": "0.23.1",
+    "style-loader": "0.13.0"
   }
 }

data/webpack.build.js

@@ -0,0 +1,25 @@
+var webpack = require('webpack');
+module.exports = {
+  entry: "./front/application.js",
+  output: {
+    path: "./lib/pig-media-server/views/",
+    filename: "bundle.js"
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.css$/, 
+        loader: "style!css"
+      },
+      {
+        test: /.js?$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        query: {
+          presets: ['es2016-node5', 'react', 'es2015']
+        }
+      }
+    ]
+  },
+  plugins: [new webpack.optimize.UglifyJsPlugin()]
+};

data/webpack.config.js

@@ -0,0 +1,30 @@
+module.exports = {
+  entry: "./front/application.js",
+  output: {
+    path: "./lib/pig-media-server/views/",
+    filename: "bundle.js"
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.css$/, 
+        loader: "style!css"
+      },
+      {
+        test: /.js?$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        query: {
+          presets: ['es2016-node5', 'react', 'es2015']
+        }
+      }
+    ]
+  },
+  devtool: "inline-source-map",
+  module: {
+    loaders: [
+      {test: /\.js$/, exclude: /node_modules/, loader: "babel-loader"},
+      { test: /\.css$/, loader: "style!css" },
+    ]
+  }
+};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pig-media-server
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '100'
 platform: ruby
 authors:
 - ssig33
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -298,28 +298,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".babelrc"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/pig-media-server
-- gulpfile.js
-- javascripts/application.js
-- javascripts/chromecast.js
-- javascripts/components/head.js
-- javascripts/components/list.js
-- javascripts/components/new_flag.js
-- javascripts/components/player.js
-- javascripts/components/query_list.js
-- javascripts/components/sort.js
-- javascripts/components/watch.js
-- javascripts/controller.js
-- javascripts/custom_list.js
-- javascripts/event_dispatcher.js
-- javascripts/recent.js
-- javascripts/utils.js
-- javascripts/video.js
+- front/application.js
+- front/chromecast.js
+- front/components/custom.js
+- front/components/head.js
+- front/components/index.js
+- front/components/item.js
+- front/components/latest.js
+- front/components/new_flag.js
+- front/components/no_match.js
+- front/components/pager.js
+- front/components/player.js
+- front/components/query_list.js
+- front/components/recommend.js
+- front/components/search.js
+- front/components/search_box.js
+- front/components/watch.js
+- front/controller.js
+- front/models/base.js
+- front/models/config.js
+- front/models/custom.js
+- front/models/custom_list.js
+- front/models/latest.js
+- front/models/list.js
+- front/models/playing.js
+- front/models/recent.js
+- front/models/recommend.js
+- front/models/session.js
 - lib/pig-media-server.rb
 - lib/pig-media-server/api.rb
 - lib/pig-media-server/aspect.rb
@@ -330,6 +342,7 @@ files:
 - lib/pig-media-server/kindle_send.rb
 - lib/pig-media-server/model/comic.rb
 - lib/pig-media-server/model/data.rb
+- lib/pig-media-server/model/data_use_rdb.rb
 - lib/pig-media-server/model/migrate.rb
 - lib/pig-media-server/model/pig.rb
 - lib/pig-media-server/script.rb
@@ -374,6 +387,8 @@ files:
 - lib/pig-media-server/web.rb
 - package.json
 - pig-media-server.gemspec
+- webpack.build.js
+- webpack.config.js
 homepage: http://github.com/ssig33/pig-media-server
 licenses:
 - MIT
@@ -394,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pig Media Server

data/gulpfile.js

@@ -1,33 +0,0 @@
-var gulp = require('gulp');
-var browserify = require('browserify');
-var babelify = require('babelify');
-var source = require('vinyl-source-stream');
-var uglify = require('gulp-uglify');
-var buffer = require('vinyl-buffer');
-var cssDir = 'stylesheets'
-
-gulp.task('browserify', function() {
-  browserify('./javascripts/application.js', { debug: true })
-    .transform(babelify)
-    .bundle()
-    .on("error", function (err) { console.log("Error : " + err.message); })
-    .pipe(source('bundle.js'))
-    .pipe(gulp.dest('./lib/pig-media-server/views/'))
-});
-
-gulp.task('build', function(){
-  browserify('./javascripts/application.js', { debug: true })
-    .transform(babelify)
-    .bundle()
-    .on("error", function (err) { console.log("Error : " + err.message); })
-    .pipe(source('bundle.js'))
-    .pipe(buffer())
-    .pipe(uglify())
-    .pipe(gulp.dest('./lib/pig-media-server/views/'))
-
-});
-
-
-gulp.task('watch', ['browserify'], function(){
-  gulp.watch('./javascripts/**/*.js', ['browserify']);
-});

data/javascripts/application.js

@@ -1,117 +0,0 @@
-window.React = require('react');
-window.ReactDOM = require('react-dom');
-window.$ = window.jQuery = require('jquery');
-window.moment = require('moment-timezone');
-
-require('./chromecast.js');
-
-require('./utils.js');
-require('./controller.js');
-
-require('./event_dispatcher.js');
-
-require('./recent.js');
-require('./video.js');
-require('./custom_list.js');
-
-require('./components/head.js');
-require('./components/sort.js');
-require('./components/list.js');
-require('./components/query_list.js');
-require('./components/new_flag.js');
-require('./components/watch.js');
-require('./components/player.js');
-
-class Application extends React.Component {
-  constructor(props){
-    super(props);
-    this.controller = new Controller();
-    this.recent = new Recent(this);
-    this.video = new Video();
-    this.custom_list = new CustomList(this);
-
-    this.state = {
-      config: {},
-      session: {},
-      items: [], 
-      recent: {},
-      video: null,
-
-      open: (link)=>{this.open(link)},
-      initialize: ()=>{this.initialize()},
-      update_state: ()=>{this.update_state()},
-
-      controller: this.controller,
-
-      models: {video: this.video, recent: this.recent, custom_list: this.custom_list}
-    }
-
-    this.state.models.video.addEventListener('videoUpdated', ()=>{ this.setState(this.state); });
-
-    window.addEventListener('popstate',(ev)=>{ this.initialize(); },false);
-  }
-
-  open(link){
-    history.pushState('', '', link);
-    this.initialize();
-  }
-
-  update_state(){ this.setState(this.state); }
-
-  load_from_api(url){ 
-    if(!!url){ 
-      $.get(url).done((data)=>{ this.state.items = data; this.update_state(); }); 
-    } else {
-      this.state.items = [];
-      this.update_state();
-    }
-  }
-
-  load_config(){ $.get("/api/r/config").done((data)=>{ this.state.config = data; this.update_state(); })}
-  load_session(){ 
-    $.get("/api/r/session").done((data)=>{ 
-      this.state.session = data; 
-      this.update_state(); 
-      this.load_recent();
-    }) 
-  }
-
-  load_recent(){ this.recent.load() }
-
-  routing(){
-    var route = this.controller.route();
-    switch(route.page){
-      case "list":
-        this.load_from_api(this.controller.route().api_url);
-        this.state.active_page = 'list';
-        this.update_state();
-        break;
-    }
-  }
-
-  initialize(){
-    this.load_config();
-    this.load_session();
-    this.custom_list.load();
-    this.routing()
-  }
-  
-  componentDidMount(){ this.initialize() }
-
-  render(){
-    return <div>
-      <Player state={this.state} />
-      <div id='all'>
-        <Head state={this.state} />
-        <SearchBox state={this.state}/>
-        <List state={this.state}/>
-        <QueryList state={this.state}/>
-      </div>
-    </div>
-  }
-}
-
-ReactDOM.render(<Application />, document.querySelector("#application"));
-
-
-

data/javascripts/components/head.js

@@ -1,106 +0,0 @@
-class LoginAs extends React.Component {
-  render(){
-    return <span>Login as {this.props.user_id}</span>
-  }
-}
-
-class LoginLink extends React.Component {
-  render(){
-    return <a href='/sessions'>Login</a>
-  }
-}
-
-class Session extends React.Component {
-  render(){
-    return <div>
-      {this.props.state.session.user_id ? 
-        <LoginAs user_id={this.props.state.session.user_id} /> :
-        <LoginLink />
-      }
-    </div>
-  }
-}
-
-class Head extends React.Component {
-  click(){
-    this.props.state.open('/'); 
-  }
-  render(){
-    return <div>
-      <Session state={this.props.state} />
-      <h2>
-        <a href='javascript:void(0)' onClick={()=> this.click()}>
-          {this.props.state.config.page_title}
-        </a>
-      </h2>
-    </div>
-  }
-}
-
-class CustomList extends React.Component{
-  click(){
-    this.props.state.open(`/custom?name=${encodeURIComponent(this.props.name)}`)
-  }
-  render(){
-    return <a href='javascript:void(0)' onClick={()=> this.click()}>{this.props.name}</a>
-  }
-}
-
-class Recommend extends React.Component{
-  click(){ this.props.state.open(`/recommend?name=${localStorage.user_id}`) }
-  render(){
-    return <span>
-      {!!localStorage.user_id ?  <a href='javascript:void(0)' onClick={()=> this.click()}><b>Recommend</b></a> : null}
-    </span>
-  }
-}
-
-class SearchBox extends React.Component {
-  submit(event){
-    event.preventDefault();
-    var query = this.refs.input.value;
-    var url = `/?query=${encodeURIComponent(query)}`
-    history.pushState(url, '', url);
-    this.props.state.initialize();
-  }
-  click(e){ this.props.state.open(e.target.dataset.url); }
-
-  full_screen(){
-    var elem = document.querySelector("body");
-    if (elem.requestFullScreen) {
-      elem.requestFullScreen();
-    } else if (elem.mozRequestFullScreen) {
-      elem.mozRequestFullScreen();
-    } else if (elem.webkitRequestFullScreen) {
-      elem.webkitRequestFullScreen();
-    }
-  }
-
-  componentDidUpdate(){
-    var query = decodeURIComponent(this.props.state.controller.query());
-    if(query == 'undefined' || query == 'null' || !query){query = ''}
-    this.refs.input.value = query;
-  }
-
-
-
-  change(){ }
-
-  render(){
-    var query = decodeURIComponent(this.props.state.controller.query());
-    if(query == 'undefined' || query == 'null' || !query){query = ''}
-    var custom_list = $.map(this.props.state.models.custom_list.list, (v,k)=>{return <CustomList key={k} name={k} state={this.props.state}/>});
-    return <form onSubmit={(e)=> this.submit(e)}>
-      <input ref='input' defaultValue={query} onChange={()=>{this.change()}}/><button>Search</button>
-      <a href='javascript:void(0)' onClick={(e)=>this.click(e)} data-url='/latest'>Latest</a>
-      <a href='/config'>Config</a>
-      <a href='javascript:void(0)' onClick={()=> this.full_screen()}>Full Screen</a>
-      <Recommend state={this.props.state} />
-      <br />
-      {custom_list}
-    </form>
-  }
-}
-
-window.Head = Head;
-window.SearchBox = SearchBox;

data/javascripts/components/list.js

@@ -1,104 +0,0 @@
-class CustomLinks extends React.Component{
-  render(){
-    return <span dangerouslySetInnerHTML={{__html: this.props.item.custom_links}}/>
-  }
-}
-
-class Item extends React.Component {
-  mtime(){ 
-    //moment(this.props.item.mtime)
-    return this.props.item.mtime;
-  }
-
-  render(){
-    var item = this.props.item;
-    var meta = `/meta/${this.props.item.key}`;
-    var sub = `/sub/${this.props.item.key}`;
-    return <span className='main_span'>
-      <NewFlag 
-        item={this.props.item}
-        state={this.props.state}
-      />
-      <a href={item.url} className='main_link'>{item.name}</a>&nbsp;
-
-      <Watch 
-        item={this.props.item}
-        state={this.props.state}
-      />
-      <ChromeCast
-        item={this.props.item}
-        state={this.props.state}
-      />
-      <span className='mtime'>{this.mtime()}</span>&nbsp;
-      <span className='size'>{size_pretty(item.size)}</span>&nbsp;
-      <a className='meta' href={meta}>Meta</a>
-      <a className='meta' href={sub}>Sub</a>
-      <CustomLinks item={this.props.item} />
-    </span>
-  }
-}
-
-class Pager extends React.Component {
-  constructor(props){
-    super(props);
-    this.page = 1;
-    var page = this.props.state.controller.params().page;
-    if(page){ this.page = parseInt(page)}
-    this.bind();
-  }
-
-  bind(){
-    $(window).on("scroll",()=>{
-      var scrollHeight = $(document).height();
-      var scrollPosition = $(window).height() + $(window).scrollTop();
-      if ((scrollHeight - scrollPosition) / scrollHeight === 0) {
-        if(this.props.state.controller.can_sort_and_paging()|| location.pathname == '/latest'){
-          this.click();
-        }
-      }
-    });
-  }
-  click(){
-    this.page ++;
-    if(location.pathname == '/latest'){
-      var url = this.props.state.controller.route().api_url += `?page=${this.page}`;
-    } else {
-      var url = this.props.state.controller.route().api_url += `&page=${this.page}`;
-    }
-    $.get(url).done((data)=>{
-      this.props.state.items = this.props.state.items.concat(data);
-      this.props.state.update_state();
-      if(location.pathname == '/latest'){
-        var new_url = `/latest?page=${this.page}`;
-      } else {
-        var new_url = `/?query=${this.props.state.controller.query()}&page=${this.page}`;
-      }
-      history.pushState('', '', new_url);
-    });
-  }
-
-  render(){ return <a href='javascript:void(0)' onClick={()=> this.click()}>Next</a> }
-}
-
-
-class List extends React.Component {
-  can_sort(){ return this.props.state.controller.can_sort_and_paging()} 
-  render(){
-
-    var items = $.map(this.props.state.items, (item)=>{
-      return <Item
-        key={item.key}
-        state={this.props.state}
-        item={item}
-      />
-    });
-
-    return <div>
-      {this.can_sort() ?  <Sort state={this.props.state} /> : null }
-      <p>{items}</p>
-      <p>{this.can_sort() || location.pathname == '/latest' ?  <Pager state={this.props.state} /> : null }</p>
-    </div>
-  }
-}
-
-window.List = List;

data/javascripts/components/new_flag.js

@@ -1,23 +0,0 @@
-class NewFlag extends React.Component{
-  is_new(){
-    if(!!this.props.state.recents){
-      var ext = window.ext(this.props.item.name);
-      if(ext == 'mp4' || ext == 'flv'){
-        var result = true;
-        $.each(this.props.state.recents, (k,v)=>{ if(k == `movie/${this.props.item.key}`){ result = false } });
-        return result
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }
-
-  render(){
-    var is_new = this.is_new();
-    return <span>{is_new ? <span className='new_flag' style={{color:'lime', "fontWeight":'bold'}}>New</span> : null }</span>
-  }
-}
-
-window.NewFlag = NewFlag;

data/javascripts/components/sort.js

@@ -1,64 +0,0 @@
-class QuerySave extends React.Component{
-  constructor(props){
-    super(props);
-    this.controller = new Controller();
-  }
-  
-  click(){
-    var query = decodeURIComponent(this.controller.query());
-    $.post("/api/r/query_list", {query: query})
-  }
-  render(){
-    return <span>
-      <a href='javascript:void(0)' onClick={()=> this.click()}>Save Query</a>
-    </span>
-  }
-}
-
-class Sort extends React.Component{
-  constructor(props){
-    super(props);
-    this.controller = new Controller();
-  }
-
-  sort_by_date(){
-    var query = this.controller.query();
-    var new_url = `/?query=${query}&sort=date&order=descending`
-    history.pushState("", "", new_url);
-    this.props.state.initialize();
-  }
-
-  sort_by_name(){
-    var query = this.controller.query();
-    var new_url = `/?query=${query}&sort=name&order=ascending`
-    history.pushState("", "", new_url);
-    this.props.state.initialize();
-  }
-
-  change_order(order){
-    var query = this.controller.query();
-    var sort = this.controller.params().sort;
-    var new_url = `/?query=${query}&sort=${sort}&order=${order}`
-    history.pushState("", "", new_url);
-    this.props.state.initialize();
-
-  }
-
-  can_change_order(){ return !!this.controller.params().sort; }
-  render(){
-    return <p>
-      <a href="javascript:void(0)" onClick={()=> this.sort_by_date()}>Sort By Date</a>
-      <a href="javascript:void(0)" onClick={()=> this.sort_by_name()}>Sort By Name</a>
-      {this.can_change_order() ?
-        <span>
-          <a href="javascript:void(0)" onClick={()=> this.change_order('ascending')}>Ascending</a>
-          <a href="javascript:void(0)" onClick={()=> this.change_order('descending')}>Descending</a>
-        </span>
-        : null
-      }
-      <QuerySave />
-    </p>
-  }
-}
-
-window.Sort = Sort;