aniview 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e7f572e02fc282a0fad72f7309b120930838da
-  data.tar.gz: 3acb283170492f2abf8d3fcb012250b5f5b3a190
+  metadata.gz: 2f84d93b24636a62d6ce22d1f9849091921c181c
+  data.tar.gz: a231335941b316bc5c11e1f65f92f2df6b413956
 SHA512:
-  metadata.gz: 7d1b14652e56f0419711f6c4ad4299f83150f6d2799871ed8a4acaa33055604de8877532941de18d52309be69786678dc173ec275d3c499ac7e7bbf0b46468c2
-  data.tar.gz: 25b773fb7c112579f96b2806caaaa006839cd8cfc610300b192cf72cecaf78e3beb3a4e2b789391d6e3b7593b3f38bdc8157715c25dbff4cced30c96753bacd6
+  metadata.gz: 7781cf1761ba7187e1f890e4be9d810e23a9e4c55983ae19df2a27af93215c7862898adfbc3af1d2dcfa2bd1d44037318479b92b9a180ae0d0317b92004247cb
+  data.tar.gz: a313caffe6a8a5c04d9501f91af855a194936f9af9a4699b904b223a4cf43c57585520d042485105592eb2f0c176751293567b118d5f22899c379b659138b5dc

data/lib/aniview.rb

@@ -10,12 +10,14 @@ Warning.ignore([:fixnum, :bignum])
 require_relative 'aniview/view/aiomenu'
 require_relative 'aniview/view/delugemenu'
 require_relative 'aniview/view/prefmenu'
+
 require_relative 'aniview/interface/animeio/animeio'
 require_relative 'aniview/interface/deluge/delugec'
 require_relative 'aniview/interface/pref/pref'
+require_relative 'aniview/interface/rssfeed/rssfeed'
 
-require_relative 'aniview/util/command'
 require_relative 'aniview/util/alogger'
+require_relative 'aniview/util/command'
 require_relative 'aniview/util/term'
 
 $stdout.sync = true
@@ -27,56 +29,37 @@ class AniView
 		
 		@pref     = Pref.new
 
-		@format_  = {
-			"aiomenu_all" => {
-				"title" => "anime_library_title_format_str",
-				"parent" => "anime_library_title_show_format_str",
-				"child" => "anime_library_title_episode_format_str",
-			},
-			"aiomenu_uw" => {
-				"title" => "anime_library_unwatched_title_format_str",
-				"parent" => "anime_library_unwatched_title_show_format_str",
-				"child" => "anime_library_unwatched_title_episode_format_str",
-			},
-			"prefmenu" => {
-				"title" => "preferences_title_format_str",
-				"parent" => "preferences_item_format_str",
-			},
-			"delugemenu" => {
-				"title" => "deluge_title_format_str",
-				"parent" => "deluge_item_format_str",
-			}
-		}
-
 		@aio     = AnimeIO.new(@pref)
-		@delugec = DelugeC.new()
-		@l       = ALogger.new(@pref.get "log_file")
+		@delugec = DelugeC.new(@pref)
+		#@rssfeed = RssFeed.new(@pref)
+		@l       = ALogger.new(@pref.parseTilde(@pref.get "log_file"))
 		@aiomenu = AioMenu.new(
-			:getAll,
-			@aio,
-			@pref.get("menu_titles")["2"],
-			@pref,
-			@format_["aiomenu_all"],
-			@term
+			refresh_function: :getAll,
+			interface:        @aio,
+			name:             @pref.get("menu_titles")["library"],
+			pref:             @pref,
+			format:           "format_library",
+			term:             @term
 		)
 		@prefmenu = PrefMenu.new(
-			:getAll,
-			@pref,
-			@pref.get("menu_titles")["0"],
-			@pref,
-			@format_["prefmenu"],
-			@term
+			refresh_function: :getAll,
+			interface:        @pref,
+			name:             @pref.get("menu_titles")["preferences"],
+			pref:             @pref,
+			format:           "format_preferences",
+			term:             @term,
+			children:         false
 		)
 		@delugemenu = DelugeMenu.new(
-			:getTorrents,
-			@delugec,
-			@pref.get("menu_titles")["7"],
-			@pref,
-			@format_["delugemenu"],
-			@term
+			refresh_function: :getTorrents,
+			interface:        @delugec,
+			name:             @pref.get("menu_titles")["torrents"],
+			pref:             @pref,
+			format:           "format_torrents",
+			term:             @term,
+			children:         false
 		)
 
-
 		@term.save.hide_cursor.echo_off
 		
 	end
@@ -128,36 +111,30 @@ class AniView
 		end
 
 		while true
-			#@view.draw if key != "skip"
 			@shoulddraw = true
 			key = @term.getKey
 			@shoulddraw = false
 		
-			if key == @pref.get("keybindings")["goto unwatched"]
+			if key == @pref.get("keybindings")["goto_unwatched"]
 				@view = @aiomenu
-				@view.setName(@pref.get("menu_titles")["1"])
-				@view.setFormat(@format_["aiomenu_uw"])
+				@view.setName(@pref.get("menu_titles")["unwatched"])
+				@view.setFormat("format_library_unwatched")
 				@view.setRfunc(:getUnwatched)
 		
-			elsif key == @pref.get("keybindings")["goto all anime"]
+			elsif key == @pref.get("keybindings")["goto_library"]
 				@view = @aiomenu
-				@view.setName(@pref.get("menu_titles")["2"])
-				@view.setFormat(@format_["aiomenu_all"])
+				@view.setName(@pref.get("menu_titles")["library"])
+				@view.setFormat("format_library")
 				@view.setRfunc(:getAll)
-		
-			elsif key == "3"
-				#@view = @anilistmenu
-				#@view.setName(@pref.get("menu_titles")[key])
-				#@view.setRfunc(:getCompleted)
 
-			elsif key == @pref.get("keybindings")["goto torrents"]
+			elsif key == @pref.get("keybindings")["goto_torrents"]
 				@view = @delugemenu
-				@view.setName(@pref.get("menu_titles")["7"])
+				@view.setName(@pref.get("menu_titles")["torrents"])
 				@view.setRfunc(:getTorrents)
 		
-			elsif key == @pref.get("keybindings")["goto preferences"]
+			elsif key == @pref.get("keybindings")["goto_preferences"]
 				@view = @prefmenu
-				@view.setName(@pref.get("menu_titles")["0"])
+				@view.setName(@pref.get("menu_titles")["preferences"])
 				@view.setRfunc(:getAll)
 		
 			elsif key == ":"

data/lib/aniview/interface/animeio/animeio.rb

@@ -25,7 +25,7 @@ class AnimeIO
 	end
 
 	def save
-		@pref.saveLocalAnime Base64.encode64(Marshal.dump @@local_anime)
+		@pref.set "local_anime", Base64.encode64(Marshal.dump @@local_anime)
 	end
 	
 	def load
@@ -40,6 +40,9 @@ class AnimeIO
 	def index_anime(force: false, verbose: false)
 		ret = {}
 		(@pref.get("anime_locations").split(":")).each { |dir|
+			
+			dir = @pref.parseTilde dir
+
 			Dir.glob("#{dir}*/*.{mkv,avi,mp4}").each { |file|
 				puts "indexing #{file}" if verbose
 				seen_this = false
@@ -92,13 +95,7 @@ class AnimeIO
 
 		(sarr).each { |animefile|
 
-			#puts animefile.path
-			
 			this_parent = parent animefile.path
-			
-			#puts animefile.path
-			#puts this_parent
-			
 
 			if this_parent != last_parent
 				ret.merge!(
@@ -160,7 +157,7 @@ class AnimeIO
 	end
 
 	def logWatched(file)
-		open(@pref.get("watch_log"), 'a') do |f|
+		open(@pref.parseTilde(@pref.get("watch_log")), 'a') do |f|
 			f.puts %x(date).chomp + " ./" + File.basename(file) + " " + @watch_log_tag
 		end
 	end

data/lib/aniview/interface/deluge/delugec.rb

@@ -3,14 +3,36 @@ require_relative 'torrentitem'
 
 class DelugeC
 
-	def initialize
+	def initialize pref
+		@pref = pref
+
+		host     = @pref.get("deluge_config")["host"]
+		login    = @pref.get("deluge_config")["login"]
+		password = @pref.get("deluge_config")["password"]
+
+		if (login == "" and password == "") and (host == "127.0.0.1" or host == "localhost")
+			la = localAuth
+			login = la[0]
+			password = la[1]
+			@pref.set(["deluge_config", "login"], login)
+			@pref.set(["deluge_config", "password"], password)
+		end
+
 		@client = Deluge::Rpc::Client.new(
-			host: 'localhost',
-			port: 58846,
-			login: 'localclient',
-			password: '1df1520eb580f2f569f4c3e846c83da2cc7a222d'
+			host:     host,
+			port:     Integer(@pref.get("deluge_config")["port"]),
+			login:    @pref.get("deluge_config")["login"],
+			password: @pref.get("deluge_config")["password"]
 		)
+
 		@client.connect
+
+	end
+
+	def localAuth
+		authfile = Dir.home + "/.config/deluge/auth"
+		["", ""] if not File.exist? authfile
+		File.open(Dir.home + "/.config/deluge/auth") { |f| f.read }.split(":")
 	end
 
 	def getTorrents
@@ -31,4 +53,4 @@ class DelugeC
 		return ret
 	end
 
-end
+end

data/lib/aniview/interface/pref/defaults.json

@@ -0,0 +1,68 @@
+{
+	"keybindings"                :
+	{
+		"goto_preferences"       : "0",
+		"goto_unwatched"         : "1",
+		"goto_library"           : "2",
+		"goto_torrents"          : "3",
+		"anime_set_watched"      : "Z",
+		"anime_set_unwatched"    : "u",
+		"anime_undo_set_watched" : "z",
+		"menu_nav_up"            : "up",
+		"menu_nav_down"          : "down",
+		"menu_nav_expand"        : "space"
+	},
+	"anime_locations"            : "~/anime/",
+	"clr"                        :
+	{
+		"main"                   : "blue",
+		"primary"                : "white",
+		"secondary"              : "cyan",
+		"selected"               : "red"
+	},
+	"menu_titles"                :
+	{
+		"unwatched"              : "unwatched",
+		"library"                : "anime library",
+		"torrents"               : "torrents",
+		"preferences"            : "preferences"
+	},
+	"format_library"             :
+	{
+		"title"                  : " %t @ %D %S ",
+		"parent"                 : " %t - %c@ %D %S ",
+		"child"                  : "  %t@ %D %S  "
+	},
+	"format_library_unwatched"   :
+	{
+		"title"                  : " %t @ $q@ %D %S ",
+		"parent"                 : " %t - %c@ %D %S ",
+		"child"                  : "  %t@ %D %S %r  "
+	},
+	"format_torrents"            :
+	{
+		"title"                  : " %t",
+		"parent"                 : " %n@ %p "
+	},
+	"format_preferences"         :
+	{
+		"title"                  : " %t",
+		"parent"                 : " %t@ %v "
+	},
+	"deluge_config"              :
+	{
+		"host"                   : "localhost",
+		"port"                   : "58846",
+		"login"                  : "",
+		"password"               : ""
+	},
+	"rss_feed"                   : 
+	{
+		"url"                    : "https://www.nyaa.se/?page=rss&cats=1_37&filter=1&term=",
+		"refresh_interval"       : "150"
+	},
+	"log_file"                   : "~/.aw/aw.log",
+	"watch_log"                  : "~/.aw/watchlog",
+	"watch_command"              : "mpv -alang jpn -slang eng -msg-level=all=fatal -ass",
+	"local_anime"                : null
+}

data/lib/aniview/interface/pref/pref.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
 require_relative 'prefitem'
+require_relative '../../view/emote.rb'
+require_relative '../../util/alogger'
 
 class Pref
 	def initialize
@@ -7,91 +9,90 @@ class Pref
 		@home = Dir.home
 		@conf = @home + "/.aw"
 
+		File.open(File.join(File.dirname(__FILE__), "/validate.json"), "r") {
+			|f| @validate = JSON.parse(f.read)
+		}
+
 		dirname = File.dirname(@conf)
-		unless File.directory?(dirname)
-		  FileUtils.mkdir_p(dirname)
-		end
+		FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
 
-		@pref_file = @conf + "/r_anime"
+		@pref_file = @conf + "/r_anime.json"
+
+		@l = ALogger.new(Dir.home + "/desktop/validate.log")
 
 		self.defaults if not File.exist?(@pref_file)
 		self.load
 	end
 
+	def parseTilde path
+		path.gsub("~", Dir.home)
+	end
+
 	def defaults
-		@pref = {
-			"keybindings" => {
-				"goto preferences"    => "0",
-				"goto unwatched"      => "1",
-				"goto all anime"      => "2",
-				"goto torrents"       => "7",
-				"anime_set watched"   => "Z",
-				"anime_set unwatched" => "u",
-				"anime_unwatch last watched"  => "z",
-				"menu_nav_up"         => "up",
-				"menu_nav_down"       => "down",
-				"menu_nav_expand"     => "space",
-			},
-			"anime_locations" => @home + "/airing/shows/" + ":" + @home + "/anime/",		
-			"clr" => {
-				"main"     => "blue",
-				"primary"  => "white",
-				"secondary"=> "cyan", 
-				"selected" => "red"
-			},
-			"menu_titles" => {
-				"1" => "unwatched",
-				"2" => "anime library",
-				"3" => "MyAnimeList",
-
-				"7" => "torrents",
-				"8" => "subscriptions",
-				"9" => "schedule",
-				"0" => "preferences"
-			},
-			"anime_library_title_format_str"                   => " %t - $r@ %D %S ",
-			"anime_library_title_show_format_str"              => " %t - %c@ %D %S ",
-			"anime_library_title_episode_format_str"           => "  %t@ %D %S %t",
-			"anime_library_unwatched_title_format_str"         => " %t@ $q@ %D %S ",
-			"anime_library_unwatched_title_show_format_str"    => " %t - %c@ %D %S ",
-			"anime_library_unwatched_title_episode_format_str" => "  %t@ %D %S %r  ",
-			"deluge_title_format_str"                          => " %t",
-			"deluge_item_format_str"                           => " %n@ %p ",
-			"preferences_title_format_str"                     => " %t",
-			"preferences_item_format_str"                      => " %t@.%v",
-
-			#"watch_file"   => @conf + "/watched",
-			"log_file"     => @conf + "/aw.log",
-			"watch_log"    => @conf + "/watchlog",
-
-			"watch_command" => "mpv -alang jpn -slang eng -msg-level=all=fatal -ass",
-
-			"local_anime"  => nil
-		}
+		File.open(File.join(File.dirname(__FILE__), "/defaults.json"), "r") {|f| @pref = JSON.parse(f.read)}
 		self.save
 	end
 
 	def set(s, val)
-		arr = [s] if s.class == String
-		arr = s   if s.class == Array
-		@pref = setpref(arr, val, @pref)
+		trail = [s] if s.class == String
+		trail = s   if s.class == Array
+		if valpref(trail, val, @validate)
+			@pref = setpref(trail, val, @pref)
+		end
+
 		save
 	end
 
-	def setpref(s, val, bpref)
-		if s.length == 1
-			bpref[s[0]]=val
-			return bpref
+	def setpref(trail, destination, map)
+		if trail.length == 1
+			map[trail[0]] = destination
+			return map
 		else
-			key = s.delete_at(0)
-			bpref[key] = setpref(s, val, bpref[key])
+			
+			blaze = trail[0]
+			map[blaze] = setpref(trail[1..-1], destination, map[blaze])
+			
+		end
+		return map
+	end
+
+	def valpref(trail, destination, map)
+		
+		if trail.length == 1
+			skeys = [
+				"space",
+				"up",
+				"down",
+				"left",
+				"right",
+				"enter"
+			]
+
+			case map[trail[0]]
+				when "key"
+					return false if destination.length != 1 and not skeys.include? destination
+	
+				when "path"
+					destination.split(":").each { |d|
+					return false if not Dir.exist?(parseTilde d)}
+	
+				when "color"
+					return false if not $clr.key? destination
+	
+				when "int"
+					return false if not destination.scan(/\D/).empty? and destination.length > 1
+			end
+
+			return true
+
+		else
+			blaze = trail[0]
+			return valpref(trail[1..-1], destination, map[blaze])
 		end
-		return bpref
 	end
 
 	def get s
 		return @pref[s] if @pref.key?(s)
-		return ""
 	end
 
 	def getAll
@@ -111,7 +112,6 @@ class Pref
 				item[1].each { |subitem|
 					subtitle = title + "_" + subitem[0]
 					subval   = subitem[1]
-
 					r.merge!(PrefItem.new(subtitle, subval, []) => [PrefItem.new("", "", [item[0], subitem[0]])])
 				}
 				next
@@ -121,11 +121,6 @@ class Pref
 		return r
 	end
 
-	def saveLocalAnime dump
-		@pref["local_anime"] = dump
-		self.save
-	end
-
 	def save
 		File.open(@pref_file, "w") { |f| f.write(@pref.to_json) }
 	end

data/lib/aniview/interface/pref/validate.json

@@ -0,0 +1,68 @@
+{
+	"keybindings"                :
+	{
+		"goto_preferences"       : "key",
+		"goto_unwatched"         : "key",
+		"goto_library"           : "key",
+		"goto_torrents"          : "key",
+		"anime_set_watched"      : "key",
+		"anime_set_unwatched"    : "key",
+		"anime_undo_set_watched" : "key",
+		"menu_nav_up"            : "key",
+		"menu_nav_down"          : "key",
+		"menu_nav_expand"        : "key"
+	},
+	"anime_locations"            : "path",
+	"clr"                        :
+	{
+		"main"                   : "color",
+		"primary"                : "color",
+		"secondary"              : "color",
+		"selected"               : "color"
+	},
+	"menu_titles"                :
+	{
+		"unwatched"              : "any",
+		"library"                : "any",
+		"torrents"               : "any",
+		"preferences"            : "any"
+	},
+	"format_library"             :
+	{
+		"title"                  : "any",
+		"parent"                 : "any",
+		"child"                  : "any"
+	},
+	"format_library_unwatched"   :
+	{
+		"title"                  : "any",
+		"parent"                 : "any",
+		"child"                  : "any"
+	},
+	"format_torrents"            :
+	{
+		"title"                  : "any",
+		"parent"                 : "any"
+	},
+	"format_preferences"         :
+	{
+		"title"                  : "any",
+		"parent"                 : "any"
+	},
+	"deluge_config"              :
+	{
+		"host"                   : "any",
+		"port"                   : "int",
+		"login"                  : "any",
+		"password"               : "any"
+	},
+	"rss_feed"                   : 
+	{
+		"url"                    : "any",
+		"refresh_interval"       : "int"
+	},
+	"log_file"                   : "path",
+	"watch_log"                  : "path",
+	"watch_command"              : "any",
+	"local_anime"                : "any"
+}

data/lib/aniview/interface/rssfeed/rssfeed.rb

@@ -0,0 +1,26 @@
+require 'simple-rss'
+require 'open-uri'
+
+class RssFeed
+	def initialize #pref
+		#@pref = pref
+		@testurl = "https://www.nyaa.se/?page=rss&cats=1_37&filter=1&term="
+	end
+
+	def updateFeed
+		#@rss = SimpleRSS.parse open(@pref.get "rss_feed")
+		@rss = SimpleRSS.parse open (@testurl)
+	end
+
+	def daemon
+		while true
+
+		end
+	end
+
+	def match string
+		@rss.items.each{ |item|
+			#item.
+		}
+	end
+end

data/lib/aniview/util/format.rb

@@ -37,4 +37,84 @@ class Format
 	def self.format_progress p
 		return "#{Integer(p)}.#{Integer(p * 10.0) % 10}"
 	end
+
+	def self.parse_format string, d, cols
+		le = "\e[K\n"
+
+		pstr = []
+		add_to = ""
+		buffer_char = []
+
+		mode = "char"
+
+		padding_collected = 0
+
+		string.split('').each { |c|
+			if mode == "e"
+				add_to += String(c)
+				escape_mode = false
+			
+			elsif c == '%'
+				mode = "%"
+			
+			elsif c == '$'
+				mode = "$"
+			
+			elsif c == '@'
+				pstr << add_to
+				add_to = ""
+				mode = "@"
+			
+			elsif c == "#"
+				padding_collected += 1
+			
+			elsif c == "\\"
+				mode = "e"
+				mode = "char"
+			
+			elsif mode == "@"
+				buffer_char << c
+				mode = "char"
+			
+			elsif mode == "%"
+				addstr = ""
+				addstr = String(d[c]) if d.key?(c)
+				ol = addstr.length
+				addstr = " " + addstr while addstr.length < (ol + padding_collected)
+				add_to += addstr
+				mode = "char"
+				
+			elsif mode == "$"
+				add_to += String($emote[c]) if $emote.key?(c)
+				mode = "char"
+
+			else
+				add_to += c
+			end
+		}
+		pstr << add_to
+
+		midstr = ""
+		tl = 0
+		pstr.each{ |s| tl += s.length }
+		buffer_space = 0
+		buffer_space = (cols - tl) / (pstr.length - 1) if pstr.length > 1
+
+		addl_space = (cols - tl) % pstr.length
+
+		pstr.each_with_index{ |str, i|
+			#buffer_space += addl_space if i == pstr.length - 2
+			#if i == pstr.length - 1
+			#puts addl_space
+			#puts i == pstr.length - 1
+
+			break if i == pstr.length - 1
+			buffer_ = ""
+			buffer_ = buffer_char[i] * buffer_space if buffer_space >= 0
+			midstr += str + buffer_
+		}
+		midstr += pstr[pstr.length - 1]
+
+		return midstr
+	end
 end

data/lib/aniview/util/online.rb

@@ -0,0 +1,12 @@
+require 'net/ping'
+
+class Online
+	def initialize
+
+	end
+
+	def up? host
+		result = %x("ping -c 1 #{host} | grep received")
+	end
+
+end

data/lib/aniview/view/aiomenu.rb

@@ -52,13 +52,13 @@ class AioMenu < Menu
 			#@malanime.update(path)
 			
 			refresh
-		elsif key == @pref.get("keybindings")["anime_set watched"]
+		elsif key == @pref.get("keybindings")["anime_set_watched"]
 			@interface.addWatched(path)
 			refresh
-		elsif key == @pref.get("keybindings")["anime_set unwatch last watched"]
+		elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
 			@interface.rmWatched()
 			refresh
-		elsif key == @pref.get("keybindings")["anime_set unwatched"]
+		elsif key == @pref.get("keybindings")["anime_set_unwatched"]
 			@interface.rmWatched(path)
 				
 		end

data/lib/aniview/view/menu.rb

@@ -1,13 +1,20 @@
 require_relative 'emote'
-require 'benchmark'
 require_relative '../util/alogger'
-require 'digest/bubblebabble'
+require_relative '../util/format'
 
 class Menu
 
-	def initialize(refresh_function, interface, name, pref, format_, term)
+	def initialize(
+		refresh_function:, 
+		interface:, 
+		name:, 
+		pref:, 
+		format:, 
+		term:,
+		children: true
+	)
 		@term = term
-		@format_ = format_
+		@format = format
 		@attributes = {
 			"t" => name,
 		}
@@ -17,6 +24,7 @@ class Menu
 		@expanded = -1
 		@selected = 0
 		@scrollup = false
+		@children = children
 		@items_formatted = {}
 		@items_hash      = {}
 		@hashmap         = {}
@@ -24,8 +32,6 @@ class Menu
 
 		refresh
 		@lastcount = getLen
-
-		@l = ALogger.new(Dir.home + "/desktop/menu.log")
 		
 	end
 
@@ -53,7 +59,7 @@ class Menu
 	end
 
 	def setFormat(format_)
-		@format_ = format_
+		@format = format_
 	end
 
 	def refresh
@@ -152,33 +158,37 @@ class Menu
 				next
 			end
 
-			parent = printmf(
-				@pref.get(@format_["parent"]),
+			parent = Format.parse_format(
+				@pref.get(@format)["parent"],
 				item[0].attributes,
+				@term.cols
 			)
 			
 			children = []
 			children_hash = []
 			
-			item[1].each { |subitem|
-
-				child_babble = subitem.cereal
-
-				if @items_hash.key? child_babble
-					val = @items_hash[babble]
-					new_items_hash.merge!(child_babble => val)
-					children<<@hashmap[babble]
-					new_hashmap.merge!(babble => @hashmap[babble])
-					next
-				end
-
-				children << printmf(
-					@pref.get(@format_["child"]),
-					subitem.attributes,
-				)
-				children_hash << subitem.hash
-
-			}
+			if @children
+				item[1].each { |subitem|
+
+					child_babble = subitem.cereal
+
+					if @items_hash.key? child_babble
+						val = @items_hash[babble]
+						new_items_hash.merge!(child_babble => val)
+						children<<@hashmap[babble]
+						new_hashmap.merge!(babble => @hashmap[babble])
+						next
+					end
+
+					children << Format.parse_format(
+						@pref.get(@format)["child"],
+						subitem.attributes,
+						@term.cols
+					)
+					children_hash << subitem.hash
+
+				}
+			end
 
 			new_items_hash.merge!(babble => children_hash)
 			new_items_formatted.merge!(parent => children)
@@ -189,9 +199,10 @@ class Menu
 		@items_hash      = new_items_hash
 		@hashmap         = new_hashmap
 
-		@title_formatted = printmf(
-			@pref.get(@format_["title"]),
+		@title_formatted = Format.parse_format(
+			@pref.get(@format)["title"],
 			@attributes,
+			@term.cols
 		)
 
 	end
@@ -245,11 +256,10 @@ class Menu
 			cl = @cl["s"] if selected
 			lo = "\e[#{line};1H" + cl
 
-			if in_expanded_region
+			if in_expanded_region and @children
 				print @cl["2"] + lo + String(@items_formatted.values[@expanded][inner_index])
 				inner_index+=1
 			elsif in_outer_region
-				#@l.log "#{@attributes["t"]} #{line_on} #{starter} #{String(@items_formatted.keys[outer_index])} - #{String(@cl["1"])} #{String(lo)}"
 				print @cl["1"] + lo + String(@items_formatted.keys[outer_index])
 				outer_index+=1
 			else
@@ -260,82 +270,6 @@ class Menu
 		end
 	end
 
-	def printmf(string, d)
-		le = "\e[K\n"
-
-		pstr = []
-		add_to = ""
-		buffer_char = []
-
-		percent_mode = false
-		dollar_mode = false
-		at_mode = false
-		escape_mode = false
-		padding_collected = 0
-
-		string.split('').each { |c|
-			if escape_mode == true
-				add_to += String(c)
-				escape_mode = false
-			elsif c == '%'
-				percent_mode = true
-			elsif c == '$'
-				dollar_mode = true
-			elsif c == '@'
-				pstr << add_to
-				add_to = ""
-				at_mode = true
-			elsif c == "#"
-				padding_collected += 1
-			elsif c == "\\"
-				escape_mode = true
-			elsif at_mode
-				buffer_char << c
-				at_mode = false
-			elsif percent_mode
-				addstr = ""
-				addstr = String(d[c]) if d.key?(c)
-				ol = addstr.length
-				while addstr.length < (ol + padding_collected)
-					addstr = " " + addstr
-				end
-
-				add_to += addstr
-
-				percent_mode = false
-			elsif dollar_mode
-				add_to += String($emote[c]) if $emote.key?(c)
-				dollar_mode = false
-			else
-				add_to += c
-			end
-		}
-		pstr << add_to
-
-		midstr = ""
-		tl = 0
-		pstr.each{ |s| tl += s.length }
-		buffer_space = 0
-		buffer_space = (@term.cols - tl) / (pstr.length - 1) if pstr.length > 1
-
-		addl_space = (@term.cols - tl) % pstr.length
-
-		pstr.each_with_index{ |str, i|
-			#buffer_space += addl_space if i == pstr.length - 2
-			#if i == pstr.length - 1
-			#puts addl_space
-			#puts i == pstr.length - 1
-
-			break if i == pstr.length - 1
-			buffer_ = ""
-			buffer_ = buffer_char[i] * buffer_space if buffer_space >= 0
-			midstr += str + buffer_
-		}
-		midstr += pstr[pstr.length - 1]
-
-		return midstr
-	end
-
 	def control(key)
 		sel = resolveSelected
 		if key == @pref.get("keybindings")["menu_nav_up"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aniview
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
@@ -90,6 +90,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: simple-rss
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: net-ping
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 description: Browse local anime, based on cmus
 email: meotleft@gmail.com
 executables:
@@ -97,25 +137,29 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "./lib/aniview.rb"
+- "./lib/aniview/interface/animeio/animefile.rb"
+- "./lib/aniview/interface/animeio/animeio.rb"
+- "./lib/aniview/interface/animeio/animeseries.rb"
+- "./lib/aniview/interface/deluge/delugec.rb"
+- "./lib/aniview/interface/deluge/torrentitem.rb"
+- "./lib/aniview/interface/item.rb"
+- "./lib/aniview/interface/pref/defaults.json"
+- "./lib/aniview/interface/pref/pref.rb"
+- "./lib/aniview/interface/pref/prefitem.rb"
+- "./lib/aniview/interface/pref/validate.json"
+- "./lib/aniview/interface/rssfeed/rssfeed.rb"
+- "./lib/aniview/util/alogger.rb"
+- "./lib/aniview/util/command.rb"
+- "./lib/aniview/util/format.rb"
+- "./lib/aniview/util/online.rb"
+- "./lib/aniview/util/term.rb"
+- "./lib/aniview/view/aiomenu.rb"
+- "./lib/aniview/view/delugemenu.rb"
+- "./lib/aniview/view/emote.rb"
+- "./lib/aniview/view/menu.rb"
+- "./lib/aniview/view/prefmenu.rb"
 - bin/aniview
-- lib/aniview.rb
-- lib/aniview/interface/animeio/animefile.rb
-- lib/aniview/interface/animeio/animeio.rb
-- lib/aniview/interface/animeio/animeseries.rb
-- lib/aniview/interface/deluge/delugec.rb
-- lib/aniview/interface/deluge/torrentitem.rb
-- lib/aniview/interface/item.rb
-- lib/aniview/interface/pref/pref.rb
-- lib/aniview/interface/pref/prefitem.rb
-- lib/aniview/util/alogger.rb
-- lib/aniview/util/command.rb
-- lib/aniview/util/format.rb
-- lib/aniview/util/term.rb
-- lib/aniview/view/aiomenu.rb
-- lib/aniview/view/delugemenu.rb
-- lib/aniview/view/emote.rb
-- lib/aniview/view/menu.rb
-- lib/aniview/view/prefmenu.rb
 homepage: https://github.com/annacrombie/aniview/
 licenses:
 - MIT