aniview 1.3.0 → 2.0.0

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

@@ -1,18 +1,19 @@
 require_relative '../item'
 
-class PrefItem < Item
-	def initialize(title, value, path_ = [])
-		@path = path_
-		@attr = {
-			"t" => title,
-			"v" => value,
-		}
-	end
+module Aniview
+  module Interface
+    class PrefItem < Item
+    	def initialize(title, value, path_ = [])
+    		@path = path_
+    		@attr = {
+    			"t" => title,
+    			"v" => value,
+    		}
+    	end
 
-	def attributes
-		return @attr
-	end
-	def path
-		return @path
-	end
-end
+    	def path
+    		return @path
+    	end
+    end
+  end
+end

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

@@ -1,94 +1,100 @@
 require 'fileutils'
 
 require_relative 'scheduleitem'
-require_relative '../../util/serializer'
+require_relative '../../util/util'
 
-class Schedule
+module Aniview
+  module Interface
+    class Schedule
 
-  def initialize pref
-    @pref = pref
-    load
-  end
-
-  def empty?
-    if @schedule == nil or @schedule.length == 0
-      @schedule = [ScheduleItem.new("no schedule", "")]
-      save
-    end
-  end
-
-  def getAll
-    empty?
-    return @schedule
-  end
-
-  def getAllCereal
-    r=""
-    getAll.each { |si| r+=si.cereal }
-    return r
-  end
+      include Aniview::Util
 
-  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
+      def initialize pref
+        @pref = pref
+        load
+      end
+    
+      def empty?
+        if @schedule == nil or @schedule.length == 0
+          @schedule = [ScheduleItem.new("no schedule", "")]
+          save
         end
-      }
-    }
-    save
-  end
-
-  def addItem item
-    @schedule.delete_at 0 if @schedule[0].attributes["t"] == "no schedule"
+      end
+    
+      def getAll
+        empty?
+        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"
+        
+        new_item = ScheduleItem.new(item, @pref.get("airing_dir"))
+    
+        FileUtils.mkdir_p @pref.parseDir new_item.attributes["p"]
+    
+        @schedule << new_item
+    
+        save
+      end
+    
+      def editItem loc, val
+        old_dir = @pref.parseDir @schedule[loc].attributes["p"]
+        @schedule[loc].setTitle val
+        new_dir = @pref.parseDir @schedule[loc].attributes["p"]
+    
+        FileUtils.mv old_dir, new_dir unless old_dir == new_dir
+    
+        save
+      end
+    
+      def removeItem loc
+        @schedule.delete_at loc
+        save
+      end
+    
+      def save
+        @pref.set "schedule", (Util.encode_object @schedule)
+      end
+      
+      def load
+        @pref.load
+        raw = @pref.get "schedule"
+        if not raw == nil and raw.class == String
+          @schedule = Util.decode_object raw
+        else
+          empty?
+        end
+      end
+    
+      def makeHash(arr)
+        ret = {}
+        arr.each{ |t|
+          ret.merge!(t => t)
+        }
+        return ret
+      end
     
-    new_item = ScheduleItem.new(item, @pref.get("airing_dir"))
-
-    FileUtils.mkdir_p @pref.parseDir new_item.attributes["p"]
-
-    @schedule << new_item
-
-    save
-  end
-
-  def editItem loc, val
-    old_dir = @pref.parseDir @schedule[loc].attributes["p"]
-    @schedule[loc].setTitle val
-    new_dir = @pref.parseDir @schedule[loc].attributes["p"]
-
-    FileUtils.mv old_dir, new_dir unless old_dir == new_dir
-
-    save
-  end
-
-  def removeItem loc
-    @schedule.delete_at loc
-    save
-  end
-
-  def save
-    @pref.set "schedule", (Serializer.e @schedule)
-  end
-  
-  def load
-    @pref.load
-    raw = @pref.get "schedule"
-    if not raw == nil and raw.class == String
-      @schedule = Serializer.d raw
-    else
-      empty?
     end
   end
-
-  def makeHash(arr)
-    ret = {}
-    arr.each{ |t|
-      ret.merge!(t => t)
-    }
-    return ret
-  end
-
 end

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

@@ -1,56 +1,59 @@
 require_relative '../item'
 require 'securerandom'
 
-class ScheduleItem < Item
-
-  def initialize(title, dir)
-    @dirpath = dir
-    @basepath = escapePath title
-    
-    @attr = {
-      "t" => title,
-      "f" => title[0..4] + "…",
-      "r" => title,
-      "p" => @dirpath + @basepath,
-      "m" => "never"
-    }
-    
-    @lastseen = 0
-    @id = SecureRandom.uuid
-  end
-
-  def updataDir nd
-    @dirpath = nd
-    @attr["p"] = nd + @basepath
-  end
-
-  def escapePath path
-    path_ = path.gsub(":", "_")
-    path_.gsub("/", ":")
-  end
-
-  def setTitle newtitle
-    @attr["t"] = newtitle
-    @attr["f"] = newtitle[0..4] + "…"
-    @attr["p"] = @dirpath + escapePath(newtitle)
-  end
-
-  def setRegexp regexp
-    @attr["r"] = regexp
-  end
-
-  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
+module Aniview
+  module Interface
+    class ScheduleItem < Item
+      def initialize(title, dir)
+        @dirpath = dir
+        @basepath = escapePath title
+        
+        @attr = {
+          "t" => title,
+          "f" => title[0..4] + "…",
+          "r" => title,
+          "p" => @dirpath + @basepath,
+          "m" => "never"
+        }
+        
+        @lastseen = 0
+        @id = SecureRandom.uuid
+      end
+    
+      def updataDir nd
+        @dirpath = nd
+        @attr["p"] = nd + @basepath
+      end
+    
+      def escapePath path
+        path_ = path.gsub(":", "_")
+        path_.gsub("/", ":")
+      end
+    
+      def setTitle newtitle
+        @attr["t"] = newtitle
+        @attr["f"] = newtitle[0..4] + "…"
+        @attr["p"] = @dirpath + escapePath(newtitle)
+      end
+    
+      def setRegexp regexp
+        @attr["r"] = regexp
+      end
+    
+      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
   end
-
 end

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

@@ -1,118 +1,121 @@
 require 'simple-rss'
 require 'open-uri'
 
-require_relative "../../util/stringhelp"
 require_relative "../schedule/scheduleitem"
 
-
-class Subscription
-	def initialize pref, schedule, delugec, client
-    @c = client
-		@pref = pref
-    @schedule = schedule
-    @delugec = delugec
-	end
-
-  def log s
-    puts "#{Time.now.to_s} [subscription] " + s
-  end
-
-  def checkDaemon
-    if @c.server?
-      "daemon up"
-    else
-      "daemon down"
-    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"])
-
-    rescue SocketError
-      @rss = nil
-
-    #rescue 
-    #  @rss = nil
-
-    end
-	end
-
-  def feed
-    @rss
-  end
-
-	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 (verbose: false)
-    updateFeed if @rss == nil
-    return [] if @rss == nil
-
-    log "matching all" if verbose
-
-    total_matches = 0
-    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
-        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
+module Aniview
+  module Interface
+    class Subscription
+    	def initialize pref, schedule, delugec, client
+        @c = client
+    		@pref = pref
+        @schedule = schedule
+        @delugec = delugec
+    	end
+    
+      def log s
+        puts "#{Time.now.to_s} [subscription] " + s
+      end
+    
+      def checkDaemon
+        if @c.server?
+          "daemon up"
+        else
+          "daemon down"
+        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"])
+    
+        rescue SocketError
+          @rss = nil
+    
+        #rescue 
+        #  @rss = nil
+    
+        end
+    	end
+    
+      def feed
+        @rss
+      end
+    
+    	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 (verbose: false)
+        updateFeed if @rss == nil
+        return [] if @rss == nil
+    
+        log "matching all" if verbose
+    
+        total_matches = 0
+        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
+            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
+    
+      def forceMatch
+        @mthread = Thread.new do
+          updateFeed
+          matchAll
+        end
+      end
+    
+      def getAll
+        @schedule.getAll
+      end
+    
+      def editItem loc, newval
+        @schedule.getAll[loc].setRegexp newval
         @schedule.save
-        total_matches+=1
       end
-    }
-    log "match complete, #{total_matches} found" if verbose
-    return total_matches
-  end
-
-  def forceMatch
-    @mthread = Thread.new do
-      updateFeed
-      matchAll
+    
+      def makeHash(arr)
+        ret = {}
+        arr.each{ |subs|
+          ret.merge!(subs => subs)
+        }
+        return ret
+      end
+    
     end
   end
-
-  def getAll
-    @schedule.getAll
-  end
-
-  def editItem loc, newval
-    @schedule.getAll[loc].setRegexp newval
-    @schedule.save
-  end
-
-  def makeHash(arr)
-    ret = {}
-    arr.each{ |subs|
-      ret.merge!(subs => subs)
-    }
-    return ret
-  end
-
 end
+