blink_tm 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080b57c4c4dac231dbb6353428aaaf7be86bd47e4da2379308c23d9ca5315aaa'
-  data.tar.gz: e13ccff20189b8e1e944230b0c27ce87272677a9d50ee2c289098800f1860fe9
+  metadata.gz: 941ae55ced42e5243dd9a489783f1b02da24fcd9c29a9cf4e3f310ea26080fbc
+  data.tar.gz: bf0c03acd5b71bddd03e0e717b8c1f12acd824668eb6e2e56948db9f055a9a67
 SHA512:
-  metadata.gz: 1ae79bb6028b57c8046e1cf68ccd62fcac30ae38a75579d6402855e9dce94d012877cd358bd0b4a99dc6ddd1376ba3548a3ac88aa59867ea54d9c7bdd7e5f16c
-  data.tar.gz: 4cc14d89f98e59675fa2071005cda0b44a4c41f421c5ea0ba850193363b33c922c623187c939f9ed48bd152277732ceb7022e3ccedc88cc13ba710c2d52157f4
+  metadata.gz: 00543e80f694b6a711f55aeacd7ab7175675273b513af336b3e3307c73a07ea21f9960a41a81bd285cd6023ff35fa2a2979552f0a7725d1580328808989ac2e6
+  data.tar.gz: 03f51e941ee7531fd2dd29500383abe4d0d88af40b25208d2b2d5991fccae3a3b67954e2efa7aa6eacbb5ca1690230037220cde6d66ef3c5281385fc4ef1d8bb

data/exe/blink-tm

@@ -1,19 +1,68 @@
 #!/usr/bin/env ruby
 require 'blink_tm'
 
-# Find Device running Blink Taskmanager
-dev = nil
-retry_count = 0
 
-while(!dev)
-	dev = BlinkTM.find_device
+if ARGV.any?(/^\-(\-version|v)$/)
+	puts "BlinkTM Version #{BlinkTM::BOLD}#{BlinkTM::VERSION}#{BlinkTM::RESET}"
+	exit
+end
+
+written_pid = false
 
-	if dev
-		puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device discovered successfully. Path: #{dev}#{BlinkTM::RESET}"
-	else
-		puts "#{BlinkTM::BOLD}#{BlinkTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: No device found. Retrying #{retry_count += 1}#{BlinkTM::RESET}"
-		sleep 0.5
+BlinkTM::log "BlinkTM Version #{BlinkTM::VERSION}"
+if File.exist?(BlinkTM::LOCKFILE)
+	BlinkTM.log 'error', "Lock file #{BlinkTM::LOCKFILE} already exists! If it's not running you might manually delete this to make blinktm work."
+
+	pid = IO.read(BlinkTM::LOCKFILE) if File.readable?(BlinkTM::LOCKFILE)
+	process_name = File.readable?("/proc/#{pid}/cmdline") ? IO.read("/proc/#{pid}/cmdline") : 'unknown'
+	stat = File.readable?("/proc/#{pid}/stat") ? IO.read("/proc/#{pid}/stat") : nil
+	state = stat ? stat.gsub(/\(.+\)/, '').split[1] : 'unknown'
+	friendly_state = case state
+		when ?S then 'Sleeping'
+		when ?I then 'Idle'
+		when ?Z then 'Zombie'
+		when ?R then 'Running'
+		when ?T then 'Stopped'
+		else 'Unknown'
+	end
+
+	BlinkTM.log 'info', <<~EOF
+		Process Details:
+		\t- ID: #{pid}
+		\t- Command: #{File.basename(process_name.gsub(?\u0000, ?\s))}
+		\t- Status: #{friendly_state}
+	EOF
+
+	exit!
+else
+	begin
+		IO.write(BlinkTM::LOCKFILE, $$)
+		written_pid = true
+	rescue Exception
+		puts "Can't write to #{BlinkTM::LOCKFILE}"
+		exit!
 	end
 end
 
-BlinkTM.start(dev)
+retry_count = 0
+
+# Find Device running Blink Taskmanager
+dev = BlinkTM::find_device!
+file = nil
+
+begin
+	BlinkTM.start(dev) { |x| file = x }
+rescue BlinkTM::SyncError
+	sleep 1
+	retry
+rescue Errno::ENOENT, Errno::EIO, BlinkTM::NoDeviceError
+	file &.close
+	sleep 0.125
+	dev = BlinkTM::find_device!
+	retry
+rescue Interrupt, SystemExit, SignalException
+	file &.close
+	File.delete(BlinkTM::LOCKFILE)
+rescue Exception
+	File.delete(BlinkTM::LOCKFILE)
+end

data/lib/blink_tm/blink_tm.rb

@@ -4,8 +4,6 @@
 module BlinkTM
 	# Detect device
 	def find_device
-		dev = nil
-
 		Dir.glob('/sys/bus/usb/devices/*').each { |x|
 			v = File.join(x, 'idVendor')
 			vendor = IO.read(v).strip if File.readable?(v)
@@ -14,39 +12,45 @@ module BlinkTM
 			product = IO.read(p).strip if File.readable?(p)
 
 			if vendor == '1a86' && product == '7523'
-				puts "#{BOLD}#{GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: A potential device discovered: #{vendor}:#{product}#{RESET}"
+				log 'warn', "A potential device discovered: #{vendor}:#{product}"
 
 				Dir.glob('/dev/ttyUSB[0-9]*').each { |x|
 					if File.writable?(x)
-						puts "#{BlinkTM::BOLD}#{BlinkTM::BLUE}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Changing baudrate to 57600...#{BlinkTM::RESET}"
+						log 'success', "Changing baudrate to 57600..."
 
 						if BlinkTM.set_baudrate(x, BlinkTM::BAUDRATE)
-							puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Successfully Changed baudrate to 57600...#{BlinkTM::RESET}"
+							log 'success', 'Successfully Changed baudrate to 57600...'
 						else
-							puts "#{BlinkTM::BOLD}#{BlinkTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Cannot change the baudrate#{BlinkTM::RESET}"
+							log 'error', 'Cannot change the baudrate'
 						end
 					else
-						"#{BOLD}#{RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: No permission granted to change Baudrate#{RESET}"
+						log 'error', 'No permission granted to change Baudrate'
 					end
 
 					if File.readable?(x)
 						begin
-							if File.open(x).readpartial(30).to_s.scrub.include?("BTM")
-								puts "#{BOLD}#{ORANGE}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Multiple Blink Task "\
-								"Manager Hardware Found! "\
-								"Selecting: #{vendor}:#{product}#{RESET}" if dev
-
-								dev = x
-							end
+							return x if File.open(x).read_nonblock(30).to_s.scrub.include?("BTM")
 						rescue EOFError
-							sleep 0.125
+							sleep 0.05
 							retry
+						rescue Errno::ENOENT, Errno::EIO
 						end
 					end
 				}
 			end
 		}
 
+		nil
+	end
+
+	@@retry_count = 0
+	def find_device!
+		while(!(dev = BlinkTM.find_device))
+			log 'error', "No device found. Retrying #{@@retry_count += 1}"
+			sleep 0.5
+		end
+
+		log 'success', "Device discovered successfully. Path: #{dev}#{BlinkTM::RESET}"
 		dev
 	end
 
@@ -103,114 +107,105 @@ module BlinkTM
 		}
 
 		prev_crc32 = ''
+		raise NoDeviceError unless device
 
-		begin
-			raise NoDeviceError unless device
-
-			in_sync = false
+		in_sync = false
 
-			fd = IO.sysopen(
-				device,
-				Fcntl::O_RDWR | Fcntl::O_NOCTTY | Fcntl::O_NONBLOCK | Fcntl::O_TRUNC
-			)
+		fd = IO.sysopen(
+			device,
+			Fcntl::O_RDWR | Fcntl::O_NOCTTY | Fcntl::O_NONBLOCK | Fcntl::O_TRUNC
+		)
 
-			file = IO.open(fd)
+		file = IO.open(fd)
+		yield file
 
-			until in_sync
-				# Clear out any extra zombie bits
-				file.syswrite(?~.freeze)
-				# Start the device
-				file.syswrite(?#.freeze)
-				file.flush
+		until in_sync
+			# Clear out any extra zombie bits
+			file.syswrite(?~.freeze)
+			# Start the device
+			file.syswrite(?#.freeze)
+			file.flush
 
-				sleep 0.125
+			sleep 0.125
 
-				begin
-					if file.readpartial(8000).include?(?~)
-						in_sync = true
-						break
-					end
-				rescue EOFError
-					sleep 0.05
-					retry
+			begin
+				if file.read_nonblock(8000).include?(?~)
+					in_sync = true
+					break
 				end
+			rescue EOFError
+				sleep 0.05
+				retry
 			end
+		end
 
-			sync_error_count = 0
+		sync_error_count = 0
 
-			puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device ready!#{BlinkTM::RESET}"
-			file.read
+		log 'success', 'Device ready!'
+		file.read
 
-			while true
-				# cpu(01234) memUsed(999993) swapUsed(999992) io_active(0)
-				# netUpload(999991) netDownload(999990)
-				# disktotal(999990) diskused(999990)
-
-				memstat = LS::Memory.stat
-				mem_u = memstat[:used].to_i.*(1024).*(100).fdiv(memstat[:total].to_i * 1024).round
-
-				swapstat = LS::Swap.stat
-				swap_u = swapstat[:used].to_i.*(1024).*(100).fdiv(swapstat[:total].to_i * 1024).round
-
-				# Output has to be exactly this long. If not, blink-taskmanager shows invalid result.
-				# No string is split inside blink-task manager, it just depends on the string length.
-				#
-				# cpu(100) memUsed(100) swapUsed(100)
-				# netDownload(9991) netUpload(9991)
-				# ioWrite(9991) ioRead(9991)
-
-				# Debugging string
-				# str = "#{"%03d" % cpu_u} #{"%03d" % mem_u} #{"%03d" % swap_u} "\
-				# "#{convert_bytes(net_u)} #{convert_bytes(net_d)} "\
-				# "#{convert_bytes(io_r)} #{convert_bytes(io_w)}"
-
-				str = "!##{"%03d" % cpu_u}#{"%03d" % mem_u}#{"%03d" % swap_u}"\
-				"#{convert_bytes(net_u)}#{convert_bytes(net_d)}"\
-				"#{convert_bytes(io_r)}#{convert_bytes(io_w)}1~"
-
-				# Rescuing from suspend
-				file.syswrite(str)
-				file.flush
-				crc32 = file.read.scrub![/\d+/]
-
-				unless crc32 == prev_crc32 || prev_crc32.empty?
-					raise SyncError if sync_error_count > 1
-					sync_error_count += 1
-				else
-					sync_error_count = 0 unless sync_error_count == 0
-				end
+		while true
+			# cpu(01234) memUsed(999993) swapUsed(999992) io_active(0)
+			# netUpload(999991) netDownload(999990)
+			# disktotal(999990) diskused(999990)
 
-				prev_crc32 = BlinkTM.crc32(str[2..-2])
-				sleep REFRESH
-			end
-		rescue Interrupt, SystemExit, SignalException
-			file &.close
-			exit 0
-		rescue Errno::ENOENT, BlinkTM::NoDeviceError
-			file &.close
-			device = find_device
-
-			unless device
-				puts "#{BlinkTM::BOLD}#{BlinkTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Error establishing connection. Don't worry if this is a valid device. Retrying...#{BlinkTM::RESET}"
-				sleep 0.1
+			memstat = LS::Memory.stat
+			mem_u = memstat[:used].to_i.*(1024).*(100).fdiv(memstat[:total].to_i * 1024).round
+
+			swapstat = LS::Swap.stat
+			swap_u = swapstat[:used].to_i.*(1024).*(100).fdiv(swapstat[:total].to_i * 1024).round
+
+			# Output has to be exactly this long. If not, blink-taskmanager shows invalid result.
+			# No string is split inside blink-task manager, it just depends on the string length.
+			#
+			# cpu(100) memUsed(100) swapUsed(100)
+			# netDownload(9991) netUpload(9991)
+			# ioWrite(9991) ioRead(9991)
+
+			# Debugging string
+			str = "#{"%03d" % cpu_u} #{"%03d" % mem_u} #{"%03d" % swap_u} "\
+			"#{convert_bytes(net_u)} #{convert_bytes(net_d)} "\
+			"#{convert_bytes(io_r)} #{convert_bytes(io_w)}"
+
+			str = "!##{"%03d" % cpu_u}#{"%03d" % mem_u}#{"%03d" % swap_u}"\
+			"#{convert_bytes(net_u)}#{convert_bytes(net_d)}"\
+			"#{convert_bytes(io_r)}#{convert_bytes(io_w)}1~"
+
+			# Rescuing from suspend
+			file.syswrite(str)
+			file.flush
+			crc32 = file.read.scrub![/\d+/]
+
+			unless crc32 == prev_crc32 || prev_crc32.empty?
+				raise SyncError if sync_error_count > 1
+				sync_error_count += 1
+			else
+				sync_error_count = 0 unless sync_error_count == 0
 			end
 
-			retry
-		rescue BlinkTM::SyncError
-			file &.close
-			sleep 0.005
-			retry
-		rescue BlinkTM::DeviceNotReady
-			file &.close
-			sleep 0.1
-			retry
-		rescue Exception
-			puts $!.full_message
-			file &.close
+			prev_crc32 = BlinkTM.crc32(str[2..-2])
+			sleep REFRESH
+		end
+
+		unless device
+			puts "#{BlinkTM::BOLD}#{BlinkTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Error establishing connection. Don't worry if this is a valid device. Retrying...#{BlinkTM::RESET}"
 			sleep 0.1
-			retry
 		end
 	end
 
+	def log(type, message = nil)
+		message, type = type, nil if type && !message
+
+		colour = case type
+			when 0, 'fatal', 'error' then BlinkTM::RED
+			when 1, 'warn' then BlinkTM::ORANGE
+			when 2, 'info' then BlinkTM::BLUE
+			when 3, 'success', 'ok' then BlinkTM::GREEN
+			else ''
+		end
+
+		puts "#{BlinkTM::BOLD}#{colour}:: #{Time.now.strftime('%H:%M:%S.%2N')}: #{message}#{BlinkTM::RESET}"
+	end
+
 	extend(self)
 end

data/lib/blink_tm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlinkTM
-	VERSION = "1.0.0"
+	VERSION = "2.0.0"
 end

data/lib/blink_tm.rb

@@ -34,6 +34,7 @@ module BlinkTM
 	ORANGE = "\e[38;2;245;155;20m"
 	BOLD = "\e[1m"
 	RESET = "\e[0m"
+	LOCKFILE = '/tmp/blinktaskmanager.pid'
 
 	# Other constants
 	ROOT_DEV = ::LinuxStat::Mounts.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blink_tm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: A controller for Arduino OLED System Monitor, Blink Task Manager