/[mldonkey]/mldonkey/src/networks/donkey/donkeyInteractive.ml
ViewVC logotype

Diff of /mldonkey/src/networks/donkey/donkeyInteractive.ml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.55 by spiralvoice, Sun Jul 17 16:12:59 2005 UTC revision 1.56 by spiralvoice, Fri Jul 22 10:58:55 2005 UTC
# Line 54  open CommonGlobals Line 54  open CommonGlobals
54  open CommonOptions  open CommonOptions
55  open DonkeyStats  open DonkeyStats
56    
57    let lprintf_nl () =
58      lprintf "%s[EDK]: "
59        (log_time ()); lprintf_nl2
60    
61  let result_name r =  let result_name r =
62    match r.result_names with    match r.result_names with
63      [] -> None      [] -> None
# Line 61  let result_name r = Line 65  let result_name r =
65    
66    
67  let op_file_proposed_filenames file =  let op_file_proposed_filenames file =
68    if !verbose then lprintf "op_file_proposed_filenames\n";    if !verbose then lprintf_nl () "op_file_proposed_filenames";
69    List2.tail_map fst file.file_filenames    List2.tail_map fst file.file_filenames
70    
71  let reconnect_all file =  let reconnect_all file =
# Line 107  let load_server_met filename = Line 111  let load_server_met filename =
111      ) ss;      ) ss;
112      List.length ss      List.length ss
113    with e ->    with e ->
114        lprintf "Exception %s while loading %s\n" (Printexc2.to_string e)        lprintf_nl () "Exception %s while loading %s" (Printexc2.to_string e)
115        filename;        filename;
116        0        0
117    else 0    else 0
# Line 137  let really_query_download filenames size Line 141  let really_query_download filenames size
141             && not (Sys.file_exists file_diskname)             && not (Sys.file_exists file_diskname)
142            then            then
143              (try              (try
144                lprintf "Renaming edonkey temp-file from %s to %s\n"                lprintf_nl () "Renaming edonkey temp-file from %s to %s"
145                    filename file_diskname;                    filename file_diskname;
146                Unix2.rename filename file_diskname;                Unix2.rename filename file_diskname;
147                Unix.chmod file_diskname 0o644;                Unix.chmod file_diskname 0o644;
148                with e ->                with e ->
149                  lprintf "Could not rename %s to %s: exception %s\n"                  lprintf_nl () "Could not rename %s to %s: exception %s"
150                    filename file_diskname (Printexc2.to_string e);                    filename file_diskname (Printexc2.to_string e);
151              )              )
152          else lprintf "THERE IS SOME PROBLEM WITH RECOVERING TEMP-FILES, THAT COULD CAUSE FILE-CORRUPTION!!!!!!!!!!! filename: %s  exists:%b file_diskname: %s  exists:%b\n"          else lprintf_nl () "THERE IS SOME PROBLEM WITH RECOVERING TEMP-FILES, THAT COULD CAUSE FILE-CORRUPTION!!!!!!!!!!! filename: %s  exists:%b file_diskname: %s  exists:%b"
153                 filename (Sys.file_exists filename)                 filename (Sys.file_exists filename)
154                 file_diskname (Sys.file_exists file_diskname);                 file_diskname (Sys.file_exists file_diskname);
155      | _ -> ()      | _ -> ()
# Line 280  let load_prefs filename = Line 284  let load_prefs filename =
284      let t = P.read s in      let t = P.read s in
285      t.P.client_tags, t.P.option_tags      t.P.client_tags, t.P.option_tags
286    with e ->    with e ->
287        lprintf "Exception %s while loading %s\n" (Printexc2.to_string e)        lprintf_nl () "Exception %s while loading %s" (Printexc2.to_string e)
288        filename;        filename;
289        [], []        [], []
290    
# Line 300  let import_temp temp_dir = Line 304  let import_temp temp_dir =
304              List.iter (fun tag ->              List.iter (fun tag ->
305                  match tag with                  match tag with
306                    { tag_name = Field_Filename; tag_value = String s } ->                    { tag_name = Field_Filename; tag_value = String s } ->
307                      lprintf "Import Donkey %s\n" s;                      lprintf_nl () "Import Donkey %s" s;
308    
309                      filenames := s :: !filenames;                      filenames := s :: !filenames;
310                  | { tag_name = Field_Size; tag_value = Uint64 v } ->                  | { tag_name = Field_Size; tag_value = Uint64 v } ->
# Line 334  let import_config dirname = Line 338  let import_config dirname =
338        | { tag_name = Field_UNKNOWN "temp"; tag_value = String s } ->        | { tag_name = Field_UNKNOWN "temp"; tag_value = String s } ->
339            if Sys.file_exists s then (* be careful on that *)            if Sys.file_exists s then (* be careful on that *)
340              temp_dir := s              temp_dir := s
341            else (lprintf "Bad temp directory, using default\n";            else (lprintf_nl () "Bad temp directory, using default";
342                )                )
343        | _ -> ()        | _ -> ()
344    ) ot;    ) ot;
# Line 942  let _ = Line 946  let _ =
946            } in            } in
947          v          v
948        with e ->        with e ->
949            lprintf "Exception %s in op_file_info\n" (Printexc2.to_string e);            lprintf_nl () "Exception %s in op_file_info" (Printexc2.to_string e);
950            raise e            raise e
951    
952    )    )
# Line 1371  let _ = Line 1375  let _ =
1375                (try                (try
1376                   try_recover_temp_file filename md4                   try_recover_temp_file filename md4
1377                 with e ->                 with e ->
1378                   lprintf "exception %s in recover_temp\n"                   lprintf_nl () "exception %s in recover_temp"
1379                   (Printexc2.to_string e);                   (Printexc2.to_string e);
1380                )                )
1381            | NoUid ->            | NoUid ->
# Line 1380  let _ = Line 1384  let _ =
1384                     let md4 = Md4.of_string filename in                     let md4 = Md4.of_string filename in
1385                     try_recover_temp_file filename md4                     try_recover_temp_file filename md4
1386                   with e ->                   with e ->
1387                     lprintf "exception %s in recover_temp\n"                     lprintf_nl () "exception %s in recover_temp"
1388                       (Printexc2.to_string e);                       (Printexc2.to_string e);
1389                )                )
1390            | _ -> ()            | _ -> ()
# Line 1410  let _ = Line 1414  let _ =
1414        | Some files ->        | Some files ->
1415            List2.tail_map (fun r -> "", r) files);            List2.tail_map (fun r -> "", r) files);
1416    client_ops.op_client_browse <- (fun c immediate ->    client_ops.op_client_browse <- (fun c immediate ->
1417        lprintf "*************** should browse  ***********\n";        lprintf_nl () "*************** should browse  ***********";
1418        match c.client_source.DonkeySources.source_sock with        match c.client_source.DonkeySources.source_sock with
1419        | Connection sock    ->        | Connection sock    ->
1420  (*  (*
# Line 1424  lprint_newline (); Line 1428  lprint_newline ();
1428              let module C = M.ViewFiles in              let module C = M.ViewFiles in
1429              M.ViewFilesReq C.t);              M.ViewFilesReq C.t);
1430        | NoConnection ->        | NoConnection ->
1431            lprintf "****************************************\n";            lprintf_nl () "****************************************";
1432            lprintf "       TRYING TO CONTACT FRIEND         \n";            lprintf_nl () "       TRYING TO CONTACT FRIEND";
1433    
1434            reconnect_client c            reconnect_client c
1435        | _ -> ()        | _ -> ()
# Line 1564  let _ = Line 1568  let _ =
1568    
1569  let _ =  let _ =
1570    CommonWeb.add_web_kind "server.met" (fun _ filename ->    CommonWeb.add_web_kind "server.met" (fun _ filename ->
1571        lprintf "FILE LOADED\n";        lprintf_nl () "server.met loaded";
1572        let n = load_server_met filename in        let n = load_server_met filename in
1573        lprintf "%d SERVERS ADDED\n" n;        lprintf_nl () "%d servers added" n;
1574    );    );
1575    CommonWeb.add_web_kind "servers.met" (fun _ filename ->    CommonWeb.add_web_kind "servers.met" (fun _ filename ->
1576        lprintf "FILE LOADED\n";        lprintf_nl () "servers.met loaded";
1577        let n = load_server_met filename in        let n = load_server_met filename in
1578        lprintf "%d SERVERS ADDED\n" n;        lprintf_nl () "%d servers added" n;
1579    );    );
1580    CommonWeb.add_web_kind "comments.met" (fun _ filename ->    CommonWeb.add_web_kind "comments.met" (fun _ filename ->
1581  (* TODO      DonkeyIndexer.load_comments filename; *)  (* TODO      DonkeyIndexer.load_comments filename; *)
1582        lprintf "COMMENTS ADDED\n";        lprintf_nl () "COMMENTS ADDED";
1583    );    );
1584    
1585    file_ops.op_file_proposed_filenames <- op_file_proposed_filenames;    file_ops.op_file_proposed_filenames <- op_file_proposed_filenames;

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26