提交: 8d8391d00f95fa8ea979381f6b80b5c8658eeb1d - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

Commit MetaInfo

• 修訂: 8d8391d00f95fa8ea979381f6b80b5c8658eeb1d (tree)
• 時間: 2015-03-28 21:15:25
• 作者: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

assorted fixes

Change Summary

• modified: lib/ninix/alias.rb
• modified: lib/ninix/balloon.rb
• modified: lib/ninix/config.rb
• modified: lib/ninix/install.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/ngm.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix/sstplib.rb
• modified: lib/ninix/update.rb

差異

--- a/lib/ninix/alias.rb
+++ b/lib/ninix/alias.rb
@@ -87,7 +87,7 @@ module Alias
               table[key] = []
               for value in values[1, values.length - 2].split(',')
                 begin
-                  value = str(int(value))
+                  value = value.to_i.to_s
                 rescue
                   #except ValueError:
                   #pass

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -1862,7 +1862,7 @@ module Balloon
     def show(default)
       if default != nil
         begin
-          text = str(default)
+          text = default.to_s
         rescue # except:
           text = ''
         end

--- a/lib/ninix/config.rb
+++ b/lib/ninix/config.rb
@@ -23,7 +23,7 @@ module NConfig
         keylist = [name]
       end
       for key in keylist
-        if self.has_key?(key)
+        if has_key?(key)
           return self[key]
         end
       end

--- a/lib/ninix/install.rb
+++ b/lib/ninix/install.rb
@@ -428,13 +428,13 @@ module Install
         filelist << [thumbnail_pnr,
                      File.join(prefix, 'thumbnail.pnr')]
       end
-      for path in self.list_all_files(ghost_src, '')
+      for path in list_all_files(ghost_src, '')
         filelist << [File.join(ghost_src, path),
                      File.join(ghost_dst, path)]
       end
       ghost_name = inst.get('name')
       # find shell
-      for path in self.list_all_files(shell_src, '')
+      for path in list_all_files(shell_src, '')
         filelist << [File.join(shell_src, path),
                      File.join(shell_dst, path)]
       end
@@ -544,7 +544,7 @@ module Install
           #logging.info('not found')
           return nil, nil, 4
         else
-          target = self.select(candidates)
+          target = select(candidates)
           if target == nil
             return nil, nil, 4
           end

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -289,7 +289,7 @@ module Kinoko
       @__shown = false
       @surface_id = 0 # dummy
       @window = Pix::TransparentWindow.new()
-      ##self.window.set_title(''.join(('surface.', name)))
+      ##@window.set_title(['surface.', name].join(''))
       @window.set_skip_taskbar_hint(true)
       @window.signal_connect('delete_event') do |w, e|
         delete(w, e)
@@ -487,7 +487,7 @@ module Kinoko
       if File.exists?(path)
         @path = path
       else
-        #self.path = None
+        #path = nil
         @path = File.join(@data['dir'], @data['base'])
       end
     end

--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -916,7 +916,7 @@ module NGM
 
     def install_current
       begin
-        filetype, target_dir = @installer.install(self.get('ArchiveUrl'),
+        filetype, target_dir = @installer.install(get('ArchiveUrl'),
                                                   Home.get_ninix_home())
       rescue #except:
         target_dir = nil
@@ -928,7 +928,7 @@ module NGM
     end
 
     def update_current ## FIXME
-      @parent.handle_request('NOTIFY', 'update_sakura', self.get('Name'), 'NGM')
+      @parent.handle_request('NOTIFY', 'update_sakura', get('Name'), 'NGM')
     end
   end
 end

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -15,6 +15,7 @@
 
 require "gtk3"
 require "gst"
+require "cgi"
 
 require "ninix/surface"
 require "ninix/balloon"
@@ -78,12 +79,6 @@ module Sakura
     # script origins
     FROM_SSTP_CLIENT = 1
     FROM_GHOST       = 2
-    # HTML entity definitions
-    begin
-        from html.entities import name2codepoint
-    rescue # except:
-        name2codepoint = nil
-    end
  
     def initialize
       @parent = nil
@@ -215,7 +210,7 @@ module Sakura
     def notify_installedshellname()
       installed = []
       for key in @shells
-        installed.append(@shells[key].baseinfo[0])
+        installed << @shells[key].baseinfo[0]
       end
       notify_event('installedshellname', *installed)
     end
@@ -317,21 +312,21 @@ module Sakura
           f = open(path, 'r')
           for line in f
             if not line.include?(',')
-              continue
+              next
             end
             key, value = line.split(',', 1)
             key = key.strip()
             if key == 'time'
               begin
-                ghost_time = int(value.strip())
+                ghost_time = value.strip().to_i
               rescue #except:
-                pass
+                #pass
               end
             elsif key == 'vanished_count'
               begin
-                ghost_vanished_count = int(value.strip())
+                ghost_vanished_count = value.strip().to_i
               rescue #except:
-                pass
+                #pass
               end
             end
           end
@@ -356,7 +351,7 @@ module Sakura
           f = open(path, 'r')
           for line in f
             if not line.include?(',')
-              continue
+              next
             end
             key, value = line.split(',', 1)
             if key.strip() == 'balloon_directory'
@@ -510,9 +505,9 @@ module Sakura
         end
         reset_script(1)
       end
-      @script_queue.append([event, script, sender, handle, host,
-                            show_sstp_marker, use_translator,
-                            db, request_handler])
+      @script_queue << [event, script, sender, handle, host,
+                        show_sstp_marker, use_translator,
+                        db, request_handler]
     end
 
     reset_event = ['OnGhostChanging', 'OnShellChanging', 'OnVanishSelected']
@@ -528,7 +523,7 @@ module Sakura
       if @reset_event.include?(event)
         reset_script(1)
       end
-      @event_queue.append([event, arglist, argdict])
+      @event_queue << [event, arglist, argdict]
     end
 
     EVENT_SCRIPTS = {
@@ -553,7 +548,7 @@ module Sakura
         argdict = {'default' => EVENT_SCRIPTS.get(event)}
         if notify_event(event, *arglist, **argdict)
           if proc != nil
-            @script_post_proc.append(proc)
+            @script_post_proc << proc
           end
           return 1
         elsif proc != nil
@@ -785,10 +780,10 @@ module Sakura
       for line in response.splitlines()
         line = str(line, @__charset, 'ignore').strip()
         if not line
-          continue
+          next
         end
         if not line.include?(':')
-          continue
+          next
         end
         key, value = line.split(':', 1)
         key = key.strip()
@@ -839,9 +834,9 @@ module Sakura
         value = ref[i]
         if value != nil
           value = value if isinstance(value, str) \
-        else str(value)
+        else value.to_s
           header = ''.join([header,
-                            'Reference', str(i), ': ',
+                            'Reference', i.to_s, ': ',
                             value, '\r\n'])
         end
       end
@@ -950,7 +945,7 @@ module Sakura
           notify_event('OnBoot', @surface.name, default=default)
         end
       else
-        pass ## FIXME
+        #pass ## FIXME
       end
     end
 
@@ -1219,7 +1214,7 @@ module Sakura
           value = arglist[n]
           if value != nil
             value = value if isinstance(value, str) \
-          else str(value)
+          else value.to_s
             logging.debug(
               'Reference{0:d}: {1}'.format(n, value))
           end
@@ -1274,7 +1269,7 @@ module Sakura
       start_script(script)
       @balloon.hide_sstp_message()
       if @boot_event.include?(event)
-        @script_finally.append(@surface_bootup)
+        @script_finally << @surface_bootup
       end
       def proc(flag_break=false)
         @parent.handle_request(
@@ -1285,7 +1280,7 @@ module Sakura
           flag_break, communication,
           nil, false, script, arglist)
       end
-      @script_finally.append(proc)
+      @script_finally << proc
       return 1
     end
 
@@ -1374,11 +1369,11 @@ module Sakura
       color_g = getstring('menu.background.font.color.g')
       color_b = getstring('menu.background.font.color.b')
       begin
-        color_r = max(0, min(255, int(color_r)))
-        color_g = max(0, min(255, int(color_g)))
-        color_b = max(0, min(255, int(color_b)))
+        color_r = max(0, min(255, color_r.to_i))
+        color_g = max(0, min(255, color_g.to_i))
+        color_b = max(0, min(255, color_b.to_i))
       rescue #except:
-        pass
+        #pass
       else
         background = [color_r, color_g, color_b]
       end
@@ -1386,11 +1381,11 @@ module Sakura
       color_g = getstring('menu.foreground.font.color.g')
       color_b = getstring('menu.foreground.font.color.b')
       begin
-        color_r = max(0, min(255, int(color_r)))
-        color_g = max(0, min(255, int(color_g)))
-        color_b = max(0, min(255, int(color_b)))
+        color_r = max(0, min(255, color_r.to_i))
+        color_g = max(0, min(255, color_g.to_i))
+        color_b = max(0, min(255, color_b.to_i))
       rescue #except:
-        pass
+        #pass
       else
         foreground = [color_r, color_g, color_b]
       end
@@ -1469,7 +1464,7 @@ module Sakura
     end
 
     def get_uptime()
-      uptime = (int(time.time() - @start_time) / 3600).to_i
+      uptime = ((time.time() - @start_time).to_i / 3600).to_i
       if uptime < 0
         @start_time = time.time()
         return 0
@@ -1745,13 +1740,13 @@ module Sakura
         @old_otherghostname = otherghostname
       end
       if not @__running
-        pass
+        #pass
       elsif [PAUSE_MODE, PAUSE_NOCLEAR_MODE].include?(@script_mode)
         ##if idle > PAUSE_TIMEOUT:
         ##    @script_mode = BROWSE_MODE
-        pass
+        #pass
       elsif @script_mode == WAIT_MODE
-        pass
+        #pass
       elsif @processed_script or @processed_text
         interpret_script()
       elsif @script_post_proc
@@ -1766,7 +1761,7 @@ module Sakura
         @script_finally = []
       elsif @script_mode == SELECT_MODE
         if @passivemode
-          pass
+          #pass
         elsif idle > SELECT_TIMEOUT
           @script_mode = BROWSE_MODE
           if @sstp_request_handler
@@ -1780,7 +1775,7 @@ module Sakura
       elsif @sstp_handle != nil
         close_sstp_handle()
       elsif @balloon.user_interaction
-        pass
+        #pass
       elsif idle > @__balloon_life > 0 and not @passivemode
         @__balloon_life = 0
         for side in range(@char)
@@ -1795,7 +1790,7 @@ module Sakura
           @surface.lower_all()
         end
       elsif @event_queue and handle_event()
-        pass
+        #pass
       elsif @script_queue and not @passivemode
         if get_silent_time() > 0
           keep_silence(true) # extend silent time
@@ -1821,7 +1816,7 @@ module Sakura
               flag_break, nil,
               [sender, host], (not use_translator), script, [])
           end
-          @script_finally.append(proc)
+          @script_finally << proc
         end
       elsif get_silent_time() > 0
         if now - get_silent_time() > SILENT_TIME
@@ -1832,13 +1827,13 @@ module Sakura
                         @surface.get_mikire(),
                         @surface.get_kasanari(),
                         (not @passivemode and @cantalk))
-        pass
+        #pass
       elsif @clock[1] != minute and \
            notify_event('OnMinuteChange', get_uptime(),
                         @surface.get_mikire(),
                         @surface.get_kasanari(),
                         (not @passivemode and @cantalk))
-        pass
+        #pass
       elsif @surface_mouse_motion != nil
         side, x, y, part = @surface_mouse_motion
         notify_event('OnMouseMove', x, y, '', side, part)
@@ -1992,7 +1987,7 @@ module Sakura
 
     def __yen_p(args)
       begin
-        chr_id = int(args[0])
+        chr_id = args[0].to_i
       rescue #except:
         return
       end
@@ -2082,7 +2077,7 @@ module Sakura
         @balloon.hide(@script_side)
       else
         begin
-          balloon_id = (int(args[0]) / 2).to_i
+          balloon_id = (args[0].to_i / 2).to_i
         rescue #except ValueError:
           balloon_id = 0
         else
@@ -2125,7 +2120,7 @@ module Sakura
 
     def __set_weight(value, unit)
       begin
-        amount = int(value) * unit - 0.01
+        amount = value.to_i * unit - 0.01
       rescue #except ValueError:
         amount = 0
       end
@@ -2161,7 +2156,7 @@ module Sakura
     def __yen__s(args)
       list = []
       for arg in args
-        list.append(int(arg))
+        list << arg.to_i
       end
       set_synchronized_session(list)
     end
@@ -2230,9 +2225,9 @@ module Sakura
 
     def __yen_i(args)
       begin
-        actor_id = int(args[0])
+        actor_id = args[0].to_i
       rescue #except ValueError:
-        pass
+        #pass
       else
         @surface.invoke(@script_side, actor_id)
       end
@@ -2264,13 +2259,9 @@ module Sakura
     end
 
     def __yen_and(args)
-      if @name2codepoint != nil
-        begin
-          text = chr(@name2codepoint.get(args[0]))
-        rescue #except:
-          text = nil
-        end
-      else
+      begin
+        text = CGI.unescape_html("&" + args[0].to_s +";")
+      rescue #except:
         text = nil
       end
       if text == nil
@@ -2281,7 +2272,7 @@ module Sakura
 
     def __yen__m(args)
       begin
-        num = int(args[0], 16)
+        num = args[0].to_i(16)
       rescue #except ValueError:
         num = 0
       end
@@ -2356,7 +2347,7 @@ module Sakura
       argc = len(args)
       args = []
       for s in args
-        args.append(expand_meta(s))
+        args << expand_meta(s)
       end
       if args[0] == 'raise' and argc >= 2
         notify_event(*args[1, 9])
@@ -2486,7 +2477,7 @@ module Sakura
         elsif args[2] == 'enable'
           @balloon.set_autoscroll(true)
         else
-          pass ## FIXME
+          #pass ## FIXME
         end
       elsif args[0, 2] == ['set', 'windowstate'] and argc > 2
         if args[2] == 'minimize'
@@ -2544,7 +2535,7 @@ module Sakura
                                  ''.join(['file://', path]))
             gsettings.set_string('picture-options', opt)
           else
-            pass # not implemented yet
+            #pass # not implemented yet
           end
         end
       elsif args[0, 2] == ['set', 'otherghosttalk'] and argc > 2
@@ -2553,7 +2544,7 @@ module Sakura
         elsif args[2] == 'false'
           @__listening['OnOtherGhostTalk'] = false
         else
-          pass ## FIXME
+          #pass ## FIXME
         end
       elsif args[0, 2] == ['set', 'othersurfacechange'] and argc > 2
         if args[2] == 'true'
@@ -2561,14 +2552,14 @@ module Sakura
         elsif args[2] == 'false'
           @__listening['OnOtherSurfaceChange'] = false
         else
-          pass ## FIXME
+          #pass ## FIXME
         end
       elsif args[0, 2] == ['set', 'balloonoffset'] and argc > 3
         begin
-          x = int(args[2])
-          y = int(args[3])
+          x = args[2].to_i
+          y = args[3].to_i
         rescue #except:
-          pass
+          #pass
         else
           @surface.set_balloon_offset(@script_side, [x, y])
         end
@@ -2595,7 +2586,7 @@ module Sakura
         elsif command == 'cdplay' and argc > 2
           @audio_player.set_state(Gst::State::NULL)
           begin
-            track = int(args[2])
+            track = args[2].to_i
           rescue #except:
             return
           end
@@ -2631,7 +2622,7 @@ module Sakura
             @audio_player.set_state(Gst::State::PLAYING)
           end
         else
-          pass ## FIXME
+          #pass ## FIXME
         end
       elsif args[0] == '*'
         @balloon.append_sstp_marker(@script_side)
@@ -2641,7 +2632,7 @@ module Sakura
         elsif args[1] == 'false'
           @quick_session = 0
         else
-          pass ## FIXME
+          #pass ## FIXME
         end
       elsif args[0] == 'bind' and argc > 2
         category = args[1]
@@ -2655,26 +2646,26 @@ module Sakura
         for key in bind
           group = bind[key][0].split(',')
           if category != group[0]
-            continue
+            next
           end
           if name and name != group[1]
-            continue
+            next
           end
           if ['true', '1'].include?(flag)
             if bind[key][1]
-              continue
+              next
             end
           elsif ['false', '0'].include?(flag)
             if not bind[key][1]
-              continue
+              next
             end
           else # 'toggle'
-            pass
+            #pass
           end
           @surface.toggle_bind([@script_side, key])
         end
       else
-        pass ## FIXME
+        #pass ## FIXME
       end
     end
 
@@ -2720,7 +2711,7 @@ module Sakura
           tag = '</u>'
         end
       else
-        pass ## FIXME
+        #pass ## FIXME
       end
       if tag != nil
         @balloon.append_meta(@script_side, tag)
@@ -2804,7 +2795,7 @@ module Sakura
         if @__script_tag.include?(name)
           @__script_tag[name].call(self, args)
         else
-          pass ## FIMXE
+          #pass ## FIMXE
         end
       elsif node[0] == ninix.script.SCRIPT_TEXT
         text = expand_meta(node[1])
@@ -2863,48 +2854,47 @@ module Sakura
       buf = []
       for chunk in text_node
         if chunk[0] == ninix.script.TEXT_STRING
-          buf.append(chunk[1])
+          buf << chunk[1]
         elsif chunk[1] == '%month'
-          buf.append(str(@current_time[1]))
+          buf << @current_time[1].to_s
         elsif chunk[1] == '%day'
-          buf.append(str(@current_time[2]))
+          buf << @current_time[2].to_s
         elsif chunk[1] == '%hour'
-          buf.append(str(@current_time[3]))
+          buf << @current_time[3].to_s
         elsif chunk[1] == '%minute'
-          buf.append(str(@current_time[4]))
+          buf << @current_time[4].to_s
         elsif chunk[1] == '%second'
-          buf.append(str(@current_time[5]))
+          buf << @current_time[5].to_s
         elsif ['%username', '%c'].include?(chunk[1])
-          buf.append(get_username())
+          buf << get_username()
         elsif chunk[1] == '%selfname'
-          buf.append(get_selfname())
+          buf << get_selfname()
         elsif chunk[1] == '%selfname2'
-          buf.append(get_selfname2())
+          buf << get_selfname2()
         elsif chunk[1] == '%keroname'
-          buf.append(get_keroname())
+          buf << get_keroname()
         elsif chunk[1] == '%friendname'
-          buf.append(get_friendname())
+          buf << get_friendname()
         elsif chunk[1] == '%screenwidth'
           left, top, scrn_w, scrn_h = ninix.pix.get_workarea()
-          buf.append(str(scrn_w))
+          buf << scrn_w.to_s
         elsif chunk[1] == '%screenheight'
           left, top, scrn_w, scrn_h = ninix.pix.get_workarea()
-          buf.append(str(scrn_h))
+          buf << scrn_h.to_s
         elsif chunk[1] == '%et'
-          buf.append('{0:d}万年'.format(@current_time[7]))
+          buf << '{0:d}万年'.format(@current_time[7])
         elsif chunk[1] == '%wronghour'
           wrongtime = time.time() + random.choice([-2, -1, 1, 2]) * 3600
-          buf.append(str(time.localtime(wrongtime)[3]))
+          buf << time.localtime(wrongtime)[3].to_s
         elsif chunk[1] == '%exh'
-          buf.append(str(get_uptime()))
+          buf << get_uptime().to_s
         elsif ['%ms', '%mz', '%ml', '%mc', '%mh', \
                '%mt', '%me', '%mp', '%m?'].include?(chunk[1])
-          buf.append(
-            getword(''.join(['\\', chunk[1][1..-1]])))
+          buf << getword(''.join(['\\', chunk[1][1..-1]]))
         elsif chunk[1] == '%dms'
-          buf.append(getdms())
+          buf << getdms()
         else # %c, %songname
-          buf.append(chunk[1])
+          buf << chunk[1]
         end
       end
       return ''.join(buf)
@@ -2919,7 +2909,7 @@ module Sakura
       begin
         @sstp_handle.send(''.join([data, '\n']))
       rescue #except socket.error:
-        pass
+        #pass
       end
     end
 
@@ -2940,7 +2930,7 @@ module Sakura
       begin
         @sstp_handle.close()
       rescue #except socket.error
-        pass
+        #pass
       end
       @sstp_handle = nil
     end

--- a/lib/ninix/sstplib.rb
+++ b/lib/ninix/sstplib.rb
@@ -21,7 +21,6 @@ module SSTPLib
 
     def initialize(hostname="", port)
       super(hostname, port)
-      #allow_reuse_address = True
       setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
     end
   end
@@ -29,7 +28,7 @@ module SSTPLib
   class AsynchronousSSTPServer < SSTPServer
 
     def handle_request
-      r, w, e = select.select([self.socket], [], [], 0)
+      r, w, e = select.select([@socket], [], [], 0)
       if not r
         return
       end

--- a/lib/ninix/update.rb
+++ b/lib/ninix/update.rb
@@ -226,7 +226,7 @@ module Update
         return
       elsif @state == 2 # updates2.dau
         enqueue_event(
-                      'OnUpdateFailure', str(code), 'updates2.dau', '',
+                      'OnUpdateFailure', code.to_s, 'updates2.dau', '',
                       'ghost') # XXX
         @state = nil
         return