[Mldonkey-commits] Changes to mldonkey/tools/make_torrent.ml

[mldonkey-commits]

Index: mldonkey/tools/make_torrent.ml
diff -u mldonkey/tools/make_torrent.ml:1.4 mldonkey/tools/make_torrent.ml:1.5
--- mldonkey/tools/make_torrent.ml:1.4  Sat May 28 11:19:43 2005
+++ mldonkey/tools/make_torrent.ml      Thu Aug  4 22:00:23 2005
@@ -22,7 +22,7 @@
 open Unix
 open Printf2
 
-  
+
 let zero = Int64.zero
 let one = Int64.one
 let (++) = Int64.add
@@ -35,48 +35,60 @@
 
 let announce = ref ""
 let torrent_filename = ref ""
-  
+let torrent_comment = ref ""
+let torrent_private = ref 0
+
 let check_tracker () =
   if !announce = "" then begin
-      Printf.printf "You must specify the tracker url with -tracker <url>";
-      print_newline (); 
+      Printf.printf "You must specify the tracker url with -tracker <url>\n";
       exit 2;
     end
-  
+
 let check_torrent () =
   if !torrent_filename = "" then begin
-      Printf.printf "You must specify the .torrent filename with -torrent 
<filename>";
-      print_newline (); 
+      Printf.printf "You must specify the .torrent filename with -torrent 
<filename>\n";
       exit 2;
     end
-    
+
 let _ =
   Arg.parse [
     "-tracker", Arg.String ((:=) announce),
     "<url> : set the tracker to put in the torrent file";
     "-torrent", Arg.String ((:=) torrent_filename),
     "<filename.torrent> : the .torrent file to use";
-    
+    "-comment", Arg.String ((:=) torrent_comment),
+    "\"<string>\" : some comments on the torrent";
+    "-private", Arg.Int ((:=) torrent_private),
+    "<0|1> : set the private flag";
+
     "-change", Arg.Unit (fun _ ->
         check_tracker ();
         check_torrent ();
         let s = File.to_string !torrent_filename in
         let torrent_id, torrent = BTTorrent.decode_torrent s in
-        let torrent = { torrent with BTTypes.torrent_announce = !announce } in
+        let torrent = { torrent with 
+          BTTypes.torrent_announce = !announce;
+          BTTypes.torrent_modified_by = Printf.sprintf "MLdonkey/%s" 
Autoconf.current_version } in
         let torrent_id, encoded =  BTTorrent.encode_torrent torrent in
         let s = Bencode.encode encoded in
         File.from_string !torrent_filename s;
-        Printf.printf "Torrent file of %s modified" (Sha1.to_string 
torrent_id);
-        print_newline ();
+        Printf.printf "Torrent file of %s modified\n" (Sha1.to_string 
torrent_id);
     ), ": change the tracker inside a .torrent file";
-    
+
     "-print", Arg.Unit (fun filename ->
         check_torrent ();
         let s = File.to_string !torrent_filename in
         let torrent_id, torrent = BTTorrent.decode_torrent s in
         Printf.printf "Torrent name: %s\n" torrent.torrent_name;
+        Printf.printf "        comment: %s\n" torrent.torrent_comment;
+        Printf.printf "        created by: %s\n" torrent.torrent_created_by;
+        Printf.printf "        creation date: %s\n" (Date.to_string 
(Int64.to_float
+          torrent.torrent_creation_date));
+        Printf.printf "        modified by: %s\n" torrent.torrent_modified_by;
         Printf.printf "        length: %Ld\n" torrent.torrent_length;
+        Printf.printf "        encoding: %s\n" torrent.torrent_encoding;
         Printf.printf "        tracker: %s\n" torrent.torrent_announce;
+        Printf.printf "        private: %s\n" (Int64.to_string 
torrent.torrent_private);
         Printf.printf "        piece size: %Ld\n" torrent.torrent_piece_size;
         Printf.printf "  Pieces: %d\n" (Array.length torrent.torrent_pieces);
         Array.iteri (fun i s ->
@@ -88,27 +100,26 @@
                 Printf.printf "    %10Ld : %s\n" len s
             ) torrent.torrent_files;
           end;
-        print_newline ();
     ), "<filename.torrent>: change the tracker inside a .torrent file";
-    
+
     "-create", Arg.String (fun filename ->
         check_tracker ();
         check_torrent ();
-        BTTorrent.generate_torrent !announce !torrent_filename filename;
-        Printf.printf "Torrent file generated";
-        print_newline ();
-    )," <filename> : compute hashes of filenames and generate a .torrent file";
-    
+        BTTorrent.generate_torrent !announce !torrent_filename !torrent_comment
+          (Int64.of_int !torrent_private) filename;
+        Printf.printf "Torrent file generated\n";
+    )," <filename> : compute hashes of filename(s) (can be a directory) and 
generate a .torrent file";
+
     "-split", Arg.String (fun filename ->
         check_torrent ();
-        
+
         let s = File.to_string !torrent_filename in
         let torrent_id, torrent = BTTorrent.decode_torrent s in
-        
-        let base_dir_name = 
+
+        let base_dir_name =
           String.sub !torrent_filename 0 ((String.length !torrent_filename) - 
8)
         in
-        
+
         let bt_fd = Unix32.create_ro filename in
         let rec iter begin_pos list =
           match list with
@@ -121,82 +132,83 @@
               lprintf "Copying %Ld %Ld to 0\n"
                 begin_pos (end_pos -- begin_pos);
               let fd = Unix32.create_rw filename in
-              Unix32.copy_chunk bt_fd fd begin_pos zero 
+              Unix32.copy_chunk bt_fd fd begin_pos zero
                 (Int64.to_int (end_pos -- begin_pos));
               Unix32.close fd;
-              
+
               iter end_pos tail
         in
         iter zero torrent.torrent_files;
         Unix32.close bt_fd;
-    
+
     ), "<filename> : split a file corresponding to a .torrent file";
-    
+
     "-check", Arg.String (fun filename ->
         check_torrent ();
         let s = File.to_string !torrent_filename in
         let torrent_id, torrent = BTTorrent.decode_torrent s in
-        
+
         if torrent.torrent_name <> Filename.basename filename then begin
-            Printf.printf "WARNING: %s <> %s" 
+            Printf.printf "WARNING: %s <> %s\n"
               torrent.torrent_name (Filename.basename filename);
-            print_newline ();
           end;
         let t = if torrent.torrent_files <> [] then
-            Unix32.create_multifile filename Unix32.ro_flag 0o666 
+            Unix32.create_multifile filename Unix32.ro_flag 0o666
               torrent.torrent_files
           else  Unix32.create_ro filename
         in
-        
+
         let length = Unix32.getsize64 t false in
-        
+
         if torrent.torrent_length <> length then begin
-            Printf.printf "ERROR: computed size %Ld <> torrent size %Ld"
+            Printf.printf "ERROR: computed size %Ld <> torrent size %Ld\n"
               length torrent.torrent_length;
-            print_newline ();
             exit 2;
           end;
-        
+
         let chunk_size = torrent.torrent_piece_size in
         let npieces = 1+ Int64.to_int ((length -- one) // chunk_size) in
-        
+
         if Array.length torrent.torrent_pieces <> npieces then begin
-            Printf.printf "ERROR: computed npieces %d <> torrent npieces %d"
+            Printf.printf "ERROR: computed npieces %d <> torrent npieces %d\n"
               npieces (Array.length torrent.torrent_pieces);
-            print_newline ();
             exit 2;
-          
+
           end;
-        
+
         for i = 0 to npieces - 1 do
           let begin_pos = chunk_size ** i in
-          
+
           let end_pos = begin_pos ++ chunk_size in
           let end_pos = 
             if end_pos > length then length else end_pos in
-          
+
           let sha1 = Sha1.digest_subfile t
               begin_pos (end_pos -- begin_pos) in
           if torrent.torrent_pieces.(i) <> sha1 then begin
-              Printf.printf "WARNING: piece %d (%Ld-%Ld) has SHA1 %s instead 
of %s"
-                i begin_pos end_pos 
+              Printf.printf "WARNING: piece %d (%Ld-%Ld) has SHA1 %s instead 
of %s\n"
+                i begin_pos end_pos
                 (Sha1.to_string sha1)
               (Sha1.to_string torrent.torrent_pieces.(i));
-              print_newline ();
             end
         done;
 
-        Printf.printf "Torrent file verified !!!";
-        print_newline ();
+        Printf.printf "Torrent file verified !!!\n";
 
     ), " <filename> : check that <filename> is well encoded by a .torrent";
   ]
     (fun s ->
       Printf.printf "Don't know what to do with %s\n" s;
-      Printf.printf "Use --help to get some help";
-      print_newline (); 
+      Printf.printf "Use --help to get some help\n";
       exit 2;
       )
-      ": manipulate .torrent files";
-    
-  
\ No newline at end of file
+      ("make_torrent : manipulate .torrent files\n\n" ^
+        "Quick Howto:\n" ^
+        "- create a new torrent:\n" ^
+        "make_torrent -tracker http://ip:port/announce -torrent file.torrent " 
^
+        "-comment \"www.mldonkey.net\" -create file\n\n" ^
+        "- change the tracker of a torrent file:\n" ^
+        "make_torrent -tracker http://ip:port/tracker -torrent myfile.torrent 
-change\n\n" ^
+        "- print the infos of a torrent file:\n" ^
+        "make_torrent -torrent myfile.torrent -print\n\n\n" ^
+        "All Options:");