screenxtv 0.0.1 → 0.0.2

data/lib/screenxtv.rb

@@ -4,6 +4,7 @@ require 'io/console'
 require 'socket'
 require 'json'
 require 'yaml'
+require 'optparse'
 
 def kvconnect(host,port)
   socket=TCPSocket.open host, port
@@ -18,9 +19,6 @@ def kvconnect(host,port)
       self.write value
     }
   end
-  def socket.lockhoge
-    sleep 1
-  end
   def socket.recv
     [self.readline.chop,JSON.parse("["+self.readline+"]")[0]]
   end
@@ -55,22 +53,33 @@ conf_scan=[
     errmsg:'unknown color.'
   },
   {key:"title",msg:"Title",value:"no title"},
-#  {
-#    key:"private",msg:"Would you like to make it private? [NO/yes]",
-#    value:'no',
-#    option:['no','yes'],
-#    errmsg:'please answer yes or no'
-#  },
 ]
 
-conf_file=ARGV[0]||"screenxtv.yml"
+argv={}
+parser=OptionParser.new do |op|
+  op.on("-u [url]"){|v|argv[:url]=v||true}
+  op.on("-c [color]"){|v|argv[:color]=v||true}
+  op.on("-t [title]"){|v|argv[:title]=v||true}
+  op.on("-reset"){|v|argv[:new]=true}
+  op.on("-f config_file"){|v|argv[:file]=v}
+end
+parser.parse(ARGV)
 
+conf_file=argv[:file] || "#{ENV['HOME']}/.screenxtv.yml"
 conf={}
 begin
   conf=YAML.load_file conf_file
 rescue
 end
 
+if argv[:new]
+  conf={}
+else
+  conf['url']=argv[:url]==true ? nil : argv[:url] if argv[:url]
+  conf['title']=argv[:title]==true ? nil : argv[:title] if argv[:title]
+  conf['color']=argv[:color]==true ? nil : argv[:color] if argv[:color]
+end
+
 conf_scan.each do |item|
   key=item[:key]
   msg=item[:msg]
@@ -86,40 +95,36 @@ conf_scan.each do |item|
     end
   end
 end
-conf['url'].gsub! /[^a-z^A-Z^0-9^_^#]/,""
+conf['url'].gsub! /[^a-z^A-Z^0-9]/,""
 conf['color'].downcase!
-#conf['private'].downcase!
 File.write conf_file,conf.to_yaml
 
 print "connecting...\n"
-
-socket=kvconnect "screenx.tv",8000
-height,width=STDOUT.winsize
-initdata={
-  width:width,height:height,slug:conf['url'],
-  info:{color:conf['color'],title:conf['title']}
-}
-#if(conf['private']=='yes')then initdata[:info][:private]='yes' end
-socket.send('init',initdata.to_json)
-url=nil
+socket=nil
 loop do
+  File.write conf_file,conf.to_yaml
+  socket=kvconnect "screenx.tv",8000
+  height,width=STDOUT.winsize
+  initdata={
+    width:width,height:height,slug:conf['url']+'#'+(conf['urlhash']||''),
+    info:{color:conf['color'],title:conf['title']}
+  }
+  socket.send('init',initdata.to_json)
   key,value=socket.recv
-  if key=='error'
-    print 'An error occured: '+value
-    exit
-  end
   if key=='slug'
-    url=value
+    conf['url'],conf['urlhash']=value.split("#")
     break
   end
+  print "Specified url '"+conf['url']+"' is alerady in use. Please set another url.\n> "
+  conf['url']=STDIN.readline.strip
 end
 
-conf['url']=url
 File.write conf_file,conf.to_yaml
 
-print "your url is http://screenx.tv/"+url.split("#")[0]+"\n\n";
+print "Your url is http://screenx.tv/"+conf['url'].split("#")[0]+"\n\n";
 print "Press Enter to start broadcasting\n> "
 STDIN.readline
+
 start
 Thread.new{
   begin
@@ -137,7 +142,7 @@ begin
   ENV['TERM']='vt100'
   ENV['LANG']='en_US.UTF-8'
   master.winsize=STDOUT.winsize
-  rr,ww,pid = PTY::getpty("screen -x hoge -R",in:slave,out:master)
+  rr,ww,pid = PTY::getpty("screen -x #{conf['screen']} -R",in:slave,out:master)
   winsize=->{
     height,width=master.winsize=rr.winsize=STDOUT.winsize
     socket.send 'winch',{width:width,height:height}.to_json
@@ -158,4 +163,3 @@ rescue
 end
 stop "broadcast end"
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screenxtv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: