aniview 1.1.0 → 1.3.0

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

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'json'
 
 require_relative 'prefitem'
-require_relative '../../view/emote.rb'
+require_relative '../../view/color'
 require_relative '../../util/alogger'
 
 class Pref
@@ -80,7 +80,7 @@ class Pref
           }
 	
 				when "color"
-					return false if not $clr.key? destination
+					return false if not Color.method_defined? destination
 	
 				when "int"
 					return false if not destination.scan(/\D/).empty? and destination.length > 1

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

@@ -72,6 +72,7 @@
     "title"                  : "any",
     "parent"                 : "any"
   },
+  "format_status"            : "any",
 	"deluge_config"              :
 	{
 		"host"                   : "any",
@@ -88,11 +89,12 @@
   {
     "port"                   : "int"
   },
+  "set_watched_percentage"   : "int",
 	"log_file"                   : "path",
   "daemon_log_file"            : "path",
 	"watch_log"                  : "path",
   "conf_dir"                   : "locked",
-	"watch_command"              : "any",
+	"mpv_args"                   : "any",
 	"local_anime"                : "any",
   "schedule"                   : "any"
 }

data/lib/aniview/interface/schedule/schedule.rb

@@ -1,7 +1,7 @@
-require 'base64'
 require 'fileutils'
 
 require_relative 'scheduleitem'
+require_relative '../../util/serializer'
 
 class Schedule
 
@@ -22,6 +22,26 @@ class Schedule
     return @schedule
   end
 
+  def getAllCereal
+    r=""
+    getAll.each { |si| r+=si.cereal }
+    return r
+  end
+
+  def mergeItems items
+    items.each { |item| 
+      @schedule.each { |schedule_item| 
+        if item.id == schedule_item.id
+          m = [schedule_item.attributes["m"], item.attributes["m"]]
+          if m[0] != m[1]
+            schedule_item.setmatched m[1]
+          end
+        end
+      }
+    }
+    save
+  end
+
   def addItem item
     @schedule.delete_at 0 if @schedule[0].attributes["t"] == "no schedule"
     
@@ -50,14 +70,14 @@ class Schedule
   end
 
   def save
-    @pref.set "schedule", Base64.encode64(Marshal.dump @schedule)
+    @pref.set "schedule", (Serializer.e @schedule)
   end
   
   def load
     @pref.load
     raw = @pref.get "schedule"
     if not raw == nil and raw.class == String
-      @schedule = Marshal.load(Base64.decode64(raw))
+      @schedule = Serializer.d raw
     else
       empty?
     end

data/lib/aniview/interface/schedule/scheduleitem.rb

@@ -16,7 +16,7 @@ class ScheduleItem < Item
     }
     
     @lastseen = 0
-    #@id = SecureRandom.uuid
+    @id = SecureRandom.uuid
   end
 
   def updataDir nd
@@ -41,6 +41,16 @@ class ScheduleItem < Item
 
   def setSeen
     @lastseen = Time.now.to_s
+    @attr["m"] = @lastseen
+  end
+
+  def setmatched date
+    @attr["m"] = date
+  end
+
+  def id
+    id = SecureRandom.uuid if @id == nil
+    @id
   end
 
 end

data/lib/aniview/interface/subscription/subscription.rb

@@ -13,6 +13,10 @@ class Subscription
     @delugec = delugec
 	end
 
+  def log s
+    puts "#{Time.now.to_s} [subscription] " + s
+  end
+
   def checkDaemon
     if @c.server?
       "daemon up"
@@ -21,6 +25,14 @@ class Subscription
     end
   end
 
+  def getLastChecked
+    @c.lastchecked
+  end
+
+  def syncMatches
+    @schedule.mergeItems @c.getItems
+  end
+
 	def updateFeed
     begin
 		  @rss = SimpleRSS.parse open(@pref.get("rss_feed")["url"])
@@ -28,8 +40,8 @@ class Subscription
     rescue SocketError
       @rss = nil
 
-    rescue 
-      @rss = nil
+    #rescue 
+    #  @rss = nil
 
     end
 	end
@@ -38,39 +50,44 @@ class Subscription
     @rss
   end
 
-  def getLastChecked
-    @c.lastchecked
-  end
-
-	def match regexp
-    updateFeed if @rss == nil
-    return [] if @rss == nil
+	def match regexp, verbose=false
     re = Regexp.new regexp
     matches = []
 		@rss.items.each{ |item|
+      #log "-> checking against #{item[:title]}" if verbose
       re.match item[:title] { matches << item }
 		}
     return matches
 	end
 
-  def matchAll
+  def matchAll (verbose: false)
+    updateFeed if @rss == nil
+    return [] if @rss == nil
+
+    log "matching all" if verbose
+
     total_matches = 0
-    getAll.each { |subs| 
-      matches = match subs.attributes["r"]
+    getAll.each { |subs|
+      log "matching #{subs.attributes["r"]}" if verbose
+      matches = match subs.attributes["r"], verbose
+      log "found #{matches.length} matches"  if verbose
+      log "#{matches}"  if verbose
+
       if matches.length >= 1
 
         downloaddir = @pref.parseDir(subs.attributes["p"]) + "/"
         newfile = downloaddir + matches[0][:title]
 
         next if File.exist? newfile
-        
-        s = @delugec.addTorrent matches[0][:link], @pref.parseDir(subs.attributes["p"])
+        log "set download dir to #{newfile}" if verbose
+        s = @delugec.addTorrent matches[0][:link], @pref.parseDir(subs.attributes["p"]), verbose: true
+        log "adding torrent, status #{s}" if verbose
         subs.setSeen if s
         @schedule.save
         total_matches+=1
-
       end
     }
+    log "match complete, #{total_matches} found" if verbose
     return total_matches
   end
 
@@ -82,7 +99,6 @@ class Subscription
   end
 
   def getAll
-    @schedule.load
     @schedule.getAll
   end
 

data/lib/aniview/util/alogger.rb

@@ -11,7 +11,7 @@ class ALogger
 
 	def log(string)
 
-		open(@logfile, 'a') { |f| f.puts "#{Time.now.to_s} string" }
+		open(@logfile, 'a') { |f| f.puts "#{Time.now.to_s} #{string}" }
 
 	end
 

data/lib/aniview/util/command.rb

@@ -1,11 +1,12 @@
 require 'readline'
+require_relative '../view/color'
 
 class Command
 	def self.read(term, prompt = "", default = "")
 		
 		term.bold.echo_on
 
-		print "\033[" + String(term.rows) + ";1H"
+		print "\033[" + String(term.rows) + ";1H" + Color.white
 		term.show_cursor
 
     Readline.completion_append_character = ""

data/lib/aniview/util/format.rb

@@ -3,11 +3,11 @@ class Format
     hours = Integer((v-(v%3600))/3600)
     minutes = Integer( ((v-(v%60))/60) - (hours * 60))
     seconds = Integer(v%60)
+    seconds = "0" + String(seconds) if seconds < 10
     if hours < 1 and minutes < 1
-      return String(seconds)
+      "0:#{seconds}"
     else
-      seconds = "0" + String(seconds) if seconds < 10
-      if hours < 1 
+      if hours < 1
         return "#{String(minutes)}:#{String(seconds)}"
       else
         minutes = "0" + String(minutes) if minutes < 10
@@ -85,7 +85,7 @@ class Format
         mode = "char"
         
       elsif mode == "$"
-        add_to += String($emote[c]) if $emote.key?(c)
+        #add_to += String($emote[c]) if $emote.key?(c)
         mode = "char"
 
       else
@@ -95,6 +95,8 @@ class Format
     }
     pstr << add_to
 
+    buffer_char << " " if buffer_char.length == 0
+
     midstr = ""
     tl = 0
     pstr.each{ |s| tl += s.length }
@@ -116,6 +118,6 @@ class Format
     }
     midstr += pstr[pstr.length - 1]
 
-    return midstr
+    return midstr[0..cols-1]
   end
 end

data/lib/aniview/util/serializer.rb

@@ -0,0 +1,19 @@
+require 'base64'
+
+class Serializer
+
+  def self.e d
+    Base64.strict_encode64(Marshal.dump d)
+  end
+
+  def self.d e
+    begin
+      Marshal.load(Base64.decode64(e))
+    rescue ArgumentError
+      {}
+    rescue TypeError
+      {}
+    end
+  end
+
+end

data/lib/aniview/view/aiomenu.rb

@@ -45,8 +45,8 @@ class AioMenu < Menu
 			refresh
 		elsif key == "enter"
 			
-			@interface.watch(path)
-			@interface.addWatched(path)
+			@interface.watch(@items.values[sel["out"]][sel["in"]])
+			#@interface.addWatched(path)
 			@interface.logWatched(path)
 
 			#@malanime.update(path)

data/lib/aniview/view/color.rb

@@ -0,0 +1,67 @@
+class Color
+
+  def self.black
+    "\e[30m"
+  end
+  
+  def self.red
+    "\e[31m"
+  end
+  
+  def self.green
+    "\e[32m"
+  end
+  
+  def self.yellow
+    "\e[33m"
+  end
+  
+  def self.blue
+    "\e[34m"
+  end
+  
+  def self.magenta
+    "\e[35m"
+  end
+  
+  def self.cyan
+    "\e[36m"
+  end
+  
+  def self.white
+    "\e[37m"
+  end
+  
+  def self.bright_black
+    "\e[37m"
+  end
+  
+  def self.bright_red
+    "\e[38m"
+  end
+  
+  def self.bright_green
+    "\e[39m"
+  end
+  
+  def self.bright_yellow
+    "\e[40m"
+  end
+  
+  def self.bright_blue
+    "\e[41m"
+  end
+  
+  def self.bright_magenta
+    "\e[42m"
+  end
+  
+  def self.bright_cyan
+    "\e[43m"
+  end
+  
+  def self.bright_white
+    "\e[44m"
+  end
+
+end

data/lib/aniview/view/delugemenu.rb

@@ -33,6 +33,10 @@ class DelugeMenu < Menu
       @interface.removeTorrent(item, true)
 		elsif key == "enter"
 
+    elsif key == "+"
+      newval = Command.read(@term, "mag:", "")
+      @interface.addTorrent newval, Dir.home + "/downloads/"
+
 		end
 	end
 

data/lib/aniview/view/emote.rb

@@ -1,97 +1,345 @@
-#define ascii codes for color names
-$clr = Hash[
-	"black" => "\e[30m", "red" => "\e[31m", "green" => "\e[32m", "yellow" => "\e[33m", "blue" => "\e[34m", "magenta" => "\e[35m", "cyan" => "\e[36m", "white" => "\e[37m",
-	"bright_black" => "\e[37m", "bright_red" => "\e[38m", "bright_green" => "\e[39m", "bright_yellow" => "\e[40m", "bright_blue" => "\e[41m", "bright_magenta" => "\e[42m", "bright_cyan" => "\e[43m", "bright_white" => "\e[44m",
-]
-
-$emote = {
-	"amazed"       => '( ﾟдﾟ)',
-	"a"            => '( ﾟдﾟ)',
-	"angry"        => '(＃ﾟДﾟ)',
-	"b"            => '(＃ﾟДﾟ)',
-	"bad"          => '（・Ａ・）',
-	"c"            => '（・Ａ・）',
-	"bowing"       => 'm(_ _)m',
-	"d"            => 'm(_ _)m',
-	"bun"          => '⊂二二二（　＾ω＾）二⊃',
-	"e"            => '⊂二二二（　＾ω＾）二⊃',
-	"carefree"     => '（´∀｀）',
-	"f"            => '（´∀｀）',
-	"chinese"      => '（｀ハ´）',
-	"g"            => '（｀ハ´）',
-	"crying"       => '（ ´Д⊂ヽ',
-	"h"            => '（´Д⊂ヽ',
-	"deflagged"    => '[ﾟдﾟ]',
-	"i"            => '[ﾟдﾟ]',
-	"deflated"     => '（´・ω・｀）',
-	"j"            => '（´・ω・｀）',
-	"depressed"    => '（ ´,_ゝ`)',
-	"k"            => '（ ´,_ゝ`)',
-	"dontknow"     => '┐(`～`；)┌',
-	"l"            => '┐(`～`；)┌',
-	"evillaugh"    => '( ﾟ∀ﾟ)ｱﾊﾊ八八ﾉヽﾉヽﾉヽﾉ ＼ / ＼/ ＼',
-	"m"            => '( ﾟ∀ﾟ)ｱﾊﾊ八八ﾉヽﾉヽﾉヽﾉ ＼ / ＼/ ＼',
-	"excitement"   => 'ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━!!!!!',
-	"n"            => 'ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━!!!!!',
-	"goofy"        => '(ﾟ∀ﾟ)',
-	"o"            => '(ﾟ∀ﾟ)',
-	"happy"        => '( ﾟ ヮﾟ)',
-	"p"            => '( ﾟ ヮﾟ)',
-	"heh"          => '(´・∀・`)',
-	"q"            => '(´•∀•`)',
-	"hooray"       => '＼(^o^)／',
-	"r"            => '\(^o^)/',
-	"hugesurprise" => 'Σ(ﾟДﾟ)',
-	"s"            => 'Σ(ﾟДﾟ)',
-	"impatience"   => '(ﾟДﾟ;≡;ﾟДﾟ)',
-	"t"            => '(ﾟДﾟ;≡;ﾟДﾟ)',
-	"indifferent"  => '（　´_ゝ`）',
-	"u"            => '（　´_ゝ`）',
-	"intuition"    => 'm9(・∀・)',
-	"v"            => 'm9(・∀・)',
-	"irritable"    => 'ヽ(`Д´)ﾉ',
-	"w"            => 'ヽ(`Д´)ﾉ',
-	"koi"          => 'щ(ﾟДﾟщ)',
-	"x"            => 'щ(ﾟДﾟщ)',
-	"korean"       => '<｀∀´>',
-	"y"            => '<｀∀´>',
-	"money"        => '（･∀･)つ⑩',
-	"z"            => '（･∀･)つ⑩',
-	"panting"      => '（ ´Д｀）',
-	"M"            => '（ ´Д｀）',
-	"peace"        => 'ヽ(´ー｀)ﾉ',
-	"N"            => 'ヽ(´ー｀)ﾉ',
-	"perky"        => '(`･ω･´)',
-	"O"            => '(`･ω･´)',
-	"sad"          => '(´；ω；`)',
-	"P"            => '(´；ω；`)',
-	"sarcasm"      => '（・∀・）',
-	"A"            => '（・∀・）',
-	"shocked"      => 'Σ(゜д゜;)',
-	"B"            => 'Σ(゜д゜;)',
-	"smoking"      => '(´ー`)y-~~',
-	"C"            => '(´ー`)y-~~',
-	"snorlax"      => '(￣ー￣)',
-	"D"            => '(￣ー￣)',
-	"spooked"      => '(((( ；ﾟДﾟ)))',
-	"E"            => '(((( ；ﾟДﾟ)))',
-	"stirring"     => '(*´Д`)',
-	"F"            => '(*´Д`)',
-	"supercilious" => 'm9(^Д^)',
-	"G"            => 'm9(^Д^)',
-	"surprised"    => '（　ﾟДﾟ）',
-	"H"            => '（　ﾟДﾟ）',
-	"tfwnogf"      => '(`A`)',
-	"I"            => '(`A`)',
-	"thinking"     => '（´-`）.｡oO',
-	"J"            => '（´-`）.｡oO',
-	"unconvincing" => 'エェェ(´д｀)ェェエ',
-	"K"            => 'エェェ(´д｀)ェェエ',
-	"unforeseen"   => '(ﾟдﾟ)',
-	"L"            => '(ﾟдﾟ)',
-	"_positive"    => [0, 5, 13, 14, 15, 17, 37]
-}
-def positive_emote
-	return $emote.values[$emote["_positive"][rand($emote["_positive"].length)]]
+class Emote
+
+  def self.amazed       
+    '( ﾟдﾟ)'
+  end
+
+	def self.a            
+    '( ﾟдﾟ)'
+  end
+
+	def self.angry        
+    '(＃ﾟДﾟ)'
+  end
+
+	def self.b            
+    '(＃ﾟДﾟ)'
+  end
+
+	def self.bad          
+    '（・Ａ・）'
+  end
+
+	def self.c            
+    '（・Ａ・）'
+  end
+
+	def self.bowing       
+    'm(_ _)m'
+  end
+
+	def self.d            
+    'm(_ _)m'
+  end
+
+	def self.bun          
+    '⊂二二二（　＾ω＾）二⊃'
+  end
+
+	def self.e            
+    '⊂二二二（　＾ω＾）二⊃'
+  end
+
+	def self.carefree     
+    '（´∀｀）'
+  end
+
+	def self.f            
+    '（´∀｀）'
+  end
+
+	def self.chinese      
+    '（｀ハ´）'
+  end
+
+	def self.g            
+    '（｀ハ´）'
+  end
+
+	def self.crying       
+    '（ ´Д⊂ヽ'
+  end
+
+	def self.h            
+    '（´Д⊂ヽ'
+  end
+
+	def self.deflagged    
+    '[ﾟдﾟ]'
+  end
+
+	def self.i            
+    '[ﾟдﾟ]'
+  end
+
+	def self.deflated     
+    '（´・ω・｀）'
+  end
+
+	def self.j            
+    '（´・ω・｀）'
+  end
+
+	def self.depressed    
+    '（ ´
+    end
+    _ゝ`)'
+  end
+
+	def self.k            
+    '（ ´
+    end
+    _ゝ`)'
+  end
+
+	def self.dontknow     
+    '┐(`～`；)┌'
+  end
+
+	def self.l            
+    '┐(`～`；)┌'
+  end
+
+	def self.evillaugh    
+    '( ﾟ∀ﾟ)ｱﾊﾊ八八ﾉヽﾉヽﾉヽﾉ ＼ / ＼/ ＼'
+  end
+
+	def self.m            
+    '( ﾟ∀ﾟ)ｱﾊﾊ八八ﾉヽﾉヽﾉヽﾉ ＼ / ＼/ ＼'
+  end
+
+	def self.excitement   
+    'ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━!!!!!'
+  end
+
+	def self.n            
+    'ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━!!!!!'
+  end
+
+	def self.goofy        
+    '(ﾟ∀ﾟ)'
+  end
+
+	def self.o            
+    '(ﾟ∀ﾟ)'
+  end
+
+	def self.happy        
+    '( ﾟ ヮﾟ)'
+  end
+
+	def self.p            
+    '( ﾟ ヮﾟ)'
+  end
+
+	def self.heh          
+    '(´・∀・`)'
+  end
+
+	def self.q            
+    '(´•∀•`)'
+  end
+
+	def self.hooray       
+    '＼(^o^)／'
+  end
+
+	def self.r            
+    '\(^o^)/'
+  end
+
+	def self.hugesurprise 
+    'Σ(ﾟДﾟ)'
+  end
+
+	def self.s            
+    'Σ(ﾟДﾟ)'
+  end
+
+	def self.impatience   
+    '(ﾟДﾟ;≡;ﾟДﾟ)'
+  end
+
+	def self.t            
+    '(ﾟДﾟ;≡;ﾟДﾟ)'
+  end
+
+	def self.indifferent  
+    '（　´_ゝ`）'
+  end
+
+	def self.u            
+    '（　´_ゝ`）'
+  end
+
+	def self.intuition    
+    'm9(・∀・)'
+  end
+
+	def self.v            
+    'm9(・∀・)'
+  end
+
+	def self.irritable    
+    'ヽ(`Д´)ﾉ'
+  end
+
+	def self.w            
+    'ヽ(`Д´)ﾉ'
+  end
+
+	def self.koi          
+    'щ(ﾟДﾟщ)'
+  end
+
+	def self.x            
+    'щ(ﾟДﾟщ)'
+  end
+
+	def self.korean       
+    '<｀∀´>'
+  end
+
+	def self.y            
+    '<｀∀´>'
+  end
+
+	def self.money        
+    '（･∀･)つ⑩'
+  end
+
+	def self.z            
+    '（･∀･)つ⑩'
+  end
+
+	def self.panting      
+    '（ ´Д｀）'
+  end
+
+	def self.M            
+    '（ ´Д｀）'
+  end
+
+	def self.peace        
+    'ヽ(´ー｀)ﾉ'
+  end
+
+	def self.N            
+    'ヽ(´ー｀)ﾉ'
+  end
+
+	def self.perky        
+    '(`･ω･´)'
+  end
+
+	def self.O            
+    '(`･ω･´)'
+  end
+
+	def self.sad          
+    '(´；ω；`)'
+  end
+
+	def self.P            
+    '(´；ω；`)'
+  end
+
+	def self.sarcasm      
+    '（・∀・）'
+  end
+
+	def self.A            
+    '（・∀・）'
+  end
+
+	def self.shocked      
+    'Σ(゜д゜;)'
+  end
+
+	def self.B            
+    'Σ(゜д゜;)'
+  end
+
+	def self.smoking      
+    '(´ー`)y-~~'
+  end
+
+	def self.C            
+    '(´ー`)y-~~'
+  end
+
+	def self.snorlax      
+    '(￣ー￣)'
+  end
+
+	def self.D            
+    '(￣ー￣)'
+  end
+
+	def self.spooked      
+    '(((( ；ﾟДﾟ)))'
+  end
+
+	def self.E            
+    '(((( ；ﾟДﾟ)))'
+  end
+
+	def self.stirring     
+    '(*´Д`)'
+  end
+
+	def self.F            
+    '(*´Д`)'
+  end
+
+	def self.supercilious 
+    'm9(^Д^)'
+  end
+
+	def self.G            
+    'm9(^Д^)'
+  end
+
+	def self.surprised    
+    '（　ﾟДﾟ）'
+  end
+
+	def self.H            
+    '（　ﾟДﾟ）'
+  end
+
+	def self.tfwnogf      
+    '(`A`)'
+  end
+
+	def self.I            
+    '(`A`)'
+  end
+
+	def self.thinking     
+    '（´-`）.｡oO'
+  end
+
+	def self.J            
+    '（´-`）.｡oO'
+  end
+
+	def self.unconvincing 
+    'エェェ(´д｀)ェェエ'
+  end
+
+	def self.K            
+    'エェェ(´д｀)ェェエ'
+  end
+
+	def self.unforeseen   
+    '(ﾟдﾟ)'
+  end
+
+	def self.L            
+    '(ﾟдﾟ)'
+  end
+
 end
 
+