aniview 1.3.0 → 2.0.0

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

@@ -1,53 +1,58 @@
 require 'date'
 
-require_relative '../../util/format'
+require_relative '../../util/util'
 require_relative '../item'
 
-class AnimeSeries < Item
-	def initialize(_dir, children)
-		@path     = _dir
-		@children = children
-
-		dur = getDuration
-		size = getSize
-
-		@attr = {
-			"t" => String(@path),
-			"c" => String(@children.length),
-			"d" => dur,
-			"D" => Format.format_duration(dur),
-			"s" => size,
-			"S" => Format.format_size(size),
-		}
-	end
-	def getDuration
-		dur = 0
-		@children.each{ |child| 
-			dur += child.attributes["d"]
-		}
-		return dur
-	end
-	
-	def getSize
-		size = 0
-		@children.each{ |child| 
-			size += child.attributes["s"]
-		}
-		return size
-	end
-
-	def oldestChild
-		oldest = DateTime.now.strftime('%Q')
-		@children.each{ |child|
-			
-		}
-	end
-
-	def title
-		return @path
-	end
-
-	def attributes
-		return @attr
-	end
+module Aniview
+  module Interface
+    class AnimeSeries < Item
+      include Aniview::Util
+    	def initialize(_dir, children)
+    		@path     = _dir
+    		@children = children
+    
+    		dur = getDuration
+    		size = getSize
+    
+    		@attr = {
+    			"t" => String(@path),
+    			"c" => String(@children.length),
+    			"d" => dur,
+    			"D" => Util.format_duration(dur),
+    			"s" => size,
+    			"S" => Util.format_size(size),
+    		}
+    	end
+    	def getDuration
+    		dur = 0
+    		@children.each{ |child| 
+    			dur += child.attributes["d"]
+    		}
+    		return dur
+    	end
+    	
+    	def getSize
+    		size = 0
+    		@children.each{ |child| 
+    			size += child.attributes["s"]
+    		}
+    		return size
+    	end
+    
+    	def oldestChild
+    		oldest = DateTime.now.strftime('%Q')
+    		@children.each{ |child|
+    			
+    		}
+    	end
+    
+    	def title
+    		return @path
+    	end
+    
+    	def attributes
+    		return @attr
+    	end
+    end
+  end
 end

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

@@ -1,159 +1,164 @@
 require 'deluge'
 require_relative 'torrentitem'
 
-class DelugeC
-
-  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:     host,
-      port:     Integer(@pref.get("deluge_config")["port"]),
-      login:    @pref.get("deluge_config")["login"],
-      password: @pref.get("deluge_config")["password"]
-    )
-
-    @status = "not connected"
-    @connected = false
-    connect
-
-  end
-
-  def getStatus
-    @status
-  end
-
-  def connect
-    @connected = false
-    @status = "error connecting"
-    begin
-      @client.connect
-    rescue Deluge::Rpc::Connection::RPCError
-      @client.close
-    rescue RuntimeError
-      @client.close
-    else
-      @status = "connected"
-      @connected = true
-    end
-
-    @client.close unless @connected
-  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
-    connect unless @connected
-    return {} unless @connected
-
-    tkeys = [
-      "name",
-      "progress",
-      "eta",
-      "paused",
-      "state",
-      "hash",
-      #"active_time",
-      #"is_finished",
-      #"max_connections",
-      #"max_download_speed",
-      #"max_upload_slots",
-      #"max_upload_speed",
-      #"message",
-      #"next_announce",
-      #"num_peers",
-      #"num_seeds",
-      #"remove_at_ratio",
-      #"save_path",
-      #"seeding_time",
-      #"seeds_peers_ratio",
-      #"seed_rank",
-      #"stop_at_ratio",
-      #"stop_ratio",
-      #"time_added",
-      #"upload_payload_rate",
-      #"comment",
-      #"file_priorities",
-      #"file_progress",
-      #"files",
-      #"is_seed",
-      #"num_files",
-      #"num_pieces",
-      #"peers",
-      #"piece_length",
-      #"private",
-      #"queue",
-      #"ratio",
-      #"total_size",
-      #"tracker_host"
-    ]
-
-    return @client.core.get_torrents_status({}, tkeys)
-  end
-
-  def toggleTorrent torrentItem
-    id = torrentItem.attributes["h"]
-    if torrentItem.attributes["u"]
-      @client.core.resume_torrent([id])
-    else
-      @client.core.pause_torrent([id])
+module Aniview
+  module Interface
+    class DelugeC
+    
+      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:     host,
+          port:     Integer(@pref.get("deluge_config")["port"]),
+          login:    @pref.get("deluge_config")["login"],
+          password: @pref.get("deluge_config")["password"]
+        )
+    
+        @status = "not connected"
+        @connected = false
+        connect
+    
+      end
+    
+      def getStatus
+        @status
+      end
+    
+      def connect
+        @connected = false
+        @status = "error connecting"
+        begin
+          @client.connect
+        rescue Deluge::Rpc::Connection::RPCError
+          @client.close
+        rescue RuntimeError
+          @client.close
+        else
+          @status = "connected"
+          @connected = true
+        end
+    
+        @client.close unless @connected
+      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
+        connect unless @connected
+        return {} unless @connected
+    
+        tkeys = [
+          "name",
+          "progress",
+          "eta",
+          "paused",
+          "state",
+          "hash",
+          #"active_time",
+          #"is_finished",
+          #"max_connections",
+          #"max_download_speed",
+          #"max_upload_slots",
+          #"max_upload_speed",
+          #"message",
+          #"next_announce",
+          #"num_peers",
+          #"num_seeds",
+          #"remove_at_ratio",
+          #"save_path",
+          #"seeding_time",
+          #"seeds_peers_ratio",
+          #"seed_rank",
+          #"stop_at_ratio",
+          #"stop_ratio",
+          #"time_added",
+          #"upload_payload_rate",
+          #"comment",
+          #"file_priorities",
+          #"file_progress",
+          #"files",
+          #"is_seed",
+          #"num_files",
+          #"num_pieces",
+          #"peers",
+          #"piece_length",
+          #"private",
+          #"queue",
+          #"ratio",
+          #"total_size",
+          #"tracker_host"
+        ]
+    
+        return @client.core.get_torrents_status({}, tkeys)
+      end
+    
+      def toggleTorrent torrentItem
+        id = torrentItem.attributes["h"]
+        if torrentItem.attributes["u"]
+          @client.core.resume_torrent([id])
+        else
+          @client.core.pause_torrent([id])
+        end
+      end
+    
+      def removeTorrent torrentItem, withData
+        id = torrentItem.attributes["h"]
+        @client.core.remove_torrent(id, withData)
+      end
+    
+      def addTorrent mag, loc, verbose: false
+        connect unless @connected
+        return false unless @connected
+        puts "[delugec] connected!" if verbose
+        begin
+          tid = @client.core.add_torrent_magnet(mag, {"download_location": loc})
+        rescue Deluge::Rpc::Connection::InvokeTimeoutError
+          puts "[delugec] Error: timeout error" if verbose
+          tid = nil
+        rescue Errno::EPIPE
+          puts "[delugec] Error: Errno::EPIPE" if verbose
+          tid = nil
+        end
+        p tid
+        return true if tid.class == String and tid.length > 1
+        return false
+      end
+    
+      def makeHash(arr)
+        ret = {}
+        arr.each{ |t|
+          tinfo = t[1]
+          torrent = TorrentItem.new(
+            name:     tinfo["name"],
+            progress: tinfo["progress"],
+            eta:      tinfo["eta"],
+            paused:   tinfo["paused"], 
+            state:    tinfo["state"],
+            id:       tinfo["hash"]
+          )
+          ret.merge!(torrent => torrent)
+        }
+        return ret
+      end
+    
     end
   end
-
-  def removeTorrent torrentItem, withData
-    id = torrentItem.attributes["h"]
-    @client.core.remove_torrent(id, withData)
-  end
-
-  def addTorrent mag, loc, verbose: false
-    connect unless @connected
-    return false unless @connected
-    puts "[delugec] connected!" if verbose
-    begin
-      tid = @client.core.add_torrent_magnet(mag, {"download_location": loc})
-    rescue Deluge::Rpc::Connection::InvokeTimeoutError
-      puts "[delugec] Error: timeout error" if verbose
-      tid = nil
-    rescue Errno::EPIPE
-      puts "[delugec] Error: Errno::EPIPE" if verbose
-      tid = nil
-    end
-    p tid
-    return true if tid.class == String and tid.length > 1
-    return false
-  end
-
-  def makeHash(arr)
-    ret = {}
-    arr.each{ |t|
-      tinfo = t[1]
-      torrent = TorrentItem.new(
-        name:     tinfo["name"],
-        progress: tinfo["progress"],
-        eta:      tinfo["eta"],
-        paused:   tinfo["paused"], 
-        state:    tinfo["state"],
-        id:       tinfo["hash"]
-      )
-      ret.merge!(torrent => torrent)
-    }
-    return ret
-  end
-
 end
+

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

@@ -1,19 +1,24 @@
-require_relative '../../util/format'
+require_relative '../../util/util'
 require_relative '../item'
 
-class TorrentItem < Item
-	def initialize(name:, progress:, eta:, paused:, state:, id:)
-		@attr = {
-			"n" => name,
-			"p" => Format.format_progress(progress),
-			"e" => Format.format_duration(eta),
-      "u" => paused,
-      "s" => state,
-      "h" => id
-		}
-	end
-
-	def attributes
-		return @attr
-	end
+module Aniview
+  module Interface
+    class TorrentItem < Item
+      include Aniview::Util
+    	def initialize(name:, progress:, eta:, paused:, state:, id:)
+    		@attr = {
+    			"n" => name,
+    			"p" => Util.format_progress(progress),
+    			"e" => Util.format_duration(eta),
+          "u" => paused,
+          "s" => state,
+          "h" => id
+    		}
+    	end
+    
+    	def attributes
+    		return @attr
+    	end
+    end
+  end
 end