Jelajahi Sumber

Fix : Share modal, add config reference for file upload

Antoine Leroyer 11 tahun lalu
induk
melakukan
51abb32884
3 mengubah file dengan 7 tambahan dan 6 penghapusan
  1. 2 4
      lib/rSeed/server.rb
  2. 3 1
      public/js/custom.js
  3. 2 1
      views/index.haml

+ 2 - 4
lib/rSeed/server.rb

@@ -122,7 +122,7 @@ module RSeed
           fd.puts fullhash
         end
       end
-      return url("/d/#{fullhash}")
+      return { "url" => url("/d/#{fullhash}"), "name" => @rtorrent.getName(fullhash) }.to_json
     end
 
     # Add Torrent File
@@ -134,15 +134,13 @@ module RSeed
     post '/add/:type' do
       case params[:type]
       when 'file'
-        File.open('data/' + params['torrentFile'][:filename], "w") do |f|
+        File.open(@config.get("data_path") + "/" + params['torrentFile'][:filename], "w") do |f|
           f.write(params['torrentFile'][:tempfile].read)
         end
         @rtorrent.add(params['torrentFile'][:filename])
         return "Success!"
       when 'link'
         # TODO
-      when 'magnet'
-        # TODO
       when 't411'
         throw(:halt, [404, "Ya pas d'id wesh ...."]) if params['lien'] == nil
         if(URI(params['lien']).host == "www.t411.me")

+ 3 - 1
public/js/custom.js

@@ -15,7 +15,9 @@ $(document).ready(function() {
         data: { hash: hash }
       })
       .done(function( msg ) {
-        $(".share-torrent-link").val(msg); 
+        var resp = $.parseJSON(msg);
+        $(".share-torrent-link").val(resp.url);
+        $(".share-torrent-name").text(resp.name);
         $('#shareModal').foundation('reveal', 'open');
       });
   });

+ 2 - 1
views/index.haml

@@ -92,7 +92,8 @@
 
 #shareModal.reveal-modal.small{"data-reveal" => ""}
   %h3 Share your download !
-  %p Here is the public link for <strong class=".share-torrent-name">torrent-name-here</strong>
+  %p Here is the public link for :
+  %strong.share-torrent-name.text-center torrent-name-here
   %input.share-torrent-link{type: "text", value: "torrent-public-link-here"}
   %a.close-reveal-modal &#215;