sinatra-torrent 0.0.4 → 0.0.5

data/Readme.md

@@ -44,7 +44,7 @@ If a torrent takes longer than 1 second to generate on-the-fly, it'll be added t
 	
 	# This line is optional, 'downloads' is the default
 	# If you've used `set :download_directory, 'files'` in your sinatra app, you need to do:
-	Sinatra::Torrent::DOWNLOAD_DIRECTORY = 'files'
+	Sinatra::Torrent.downloads_directory = 'files'
 	
 	# The rest of your Rakefile
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/sinatra/torrent.rb

@@ -14,7 +14,7 @@ module Sinatra
       # Putting the annouce URL of a tracker in here will use that tracker rather than the inbuilt one
       app.set :external_tracker, nil
       # Directory which holds all the files which will be provided as torrents
-      app.set :downloads_directory, File.join(File.dirname(__FILE__),Sinatra::Torrent::DOWNLOADS_DIRECTORY)
+      app.set :downloads_directory, File.join(File.dirname(__FILE__),Sinatra::Torrent.downloads_directory)
       # Mount point for the downloads directory
       app.set :downloads_mount, 'downloads'
       # Mount point for the torrents directory
@@ -39,14 +39,14 @@ module Sinatra
         filename = File.join(options.downloads_directory, rel_location)
         halt(404, "That file doesn't exist! #{filename}") unless File.exists?(filename)
         
-        if !(d = options.database_adapter.torrent_by_path_and_timestamp(filename,File.mtime(filename)))
-          
+        if !(d = options.database_adapter.torrent_by_path_and_timestamp(rel_location,File.mtime(filename)))
+          p d
           begin
             Timeout::timeout(1) do
               d = Sinatra::Torrent.create(filename)
             end
           rescue Timeout::Error
-            eta = options.database_adapter.add_hashjob(filename)
+            eta = options.database_adapter.add_hashjob(rel_location)
             
             begin
               wait = case (eta/60).floor
@@ -64,7 +64,7 @@ module Sinatra
             halt(503,"This torrent is taking too long to build, we're running it in the background. Please try again in #{wait}.")
           end
           
-          options.database_adapter.store_torrent(filename,File.mtime(filename),d['metadata'],d['infohash'])
+          options.database_adapter.store_torrent(rel_location,File.mtime(filename),d['metadata'],d['infohash'])
         end
         
         # These are options which could change between database retrievals

data/lib/sinatra/torrent/hashing.rb

@@ -9,7 +9,7 @@ namespace :hash do
 
   task :add do
     ARGV[1..-1].each do |rel_location|
-      if (File.exists?(File.join(Sinatra::Torrent::DOWNLOADS_DIRECTORY,rel_location)))
+      if (File.exists?(File.join(Sinatra::Torrent.downloads_directory,rel_location)))
         torrent_db.add_hashjob(rel_location)
         $stdout.puts "added to queue: #{rel_location}"
       else
@@ -22,13 +22,13 @@ namespace :hash do
     completed = 0
     failed = 0
     
-    Dir[File.join(Sinatra::Torrent::DOWNLOADS_DIRECTORY,'**')].each do |filename|
-      rel_location = filename[Sinatra::Torrent::DOWNLOADS_DIRECTORY.length+1..-1]
+    Dir[File.join(Sinatra::Torrent.downloads_directory,'**')].each do |filename|
+      rel_location = filename[Sinatra::Torrent.downloads_directory.length+1..-1]
       
       begin
         if !torrent_db.torrent_by_path_and_timestamp(rel_location,File.mtime(filename))
           d = Sinatra::Torrent.create(filename)
-        
+          
           torrent_db.store_torrent(rel_location,File.mtime(filename),d['metadata'],d['infohash'])
         
           torrent_db.remove_hashjob(rel_location)
@@ -53,7 +53,7 @@ namespace :hash do
     failed = 0
     
     torrent_db.list_hashjobs.each do |rel_location|
-      filename = File.join(Sinatra::Torrent::DOWNLOADS_DIRECTORY,rel_location)
+      filename = File.join(Sinatra::Torrent.downloads_directory,rel_location)
       begin
         if torrent_db.torrent_by_path_and_timestamp(rel_location,File.mtime(filename))
           torrent_db.remove_hashjob(rel_location)

data/lib/sinatra/torrent/helpers.rb

@@ -4,7 +4,20 @@ require 'bencode'
 
 module Sinatra
   module Torrent
-    DOWNLOADS_DIRECTORY = 'downloads'
+    @@downloads_directory = 'downloads'
+    
+    def self.downloads_directory=(d)
+      if File.directory?(d)
+        @@downloads_directory = d
+      else
+        # TODO: ERR error
+        raise RuntimeError, "The downloads directory doesn't exist"
+      end
+    end
+    
+    def self.downloads_directory
+      @@downloads_directory
+    end
     
     def self.create(filename)
       d = {

data/sinatra-torrent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-torrent}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["JP Hastings-Spital"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-10}
   s.description = %q{An extension to Sinatra which will allow you to run a webseeded torrent tracker of files in the folder you specify.}
   s.email = %q{jphastings@gmail.com}
   s.files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-torrent
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - JP Hastings-Spital
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +00:00
+date: 2011-02-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency