- Timestamp:
- 11/25/08 17:06:10 (11 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/res/Halite.rc
r633 r634 741 741 STRINGTABLE 742 742 BEGIN 743 HAL_NEW_PANE_DLG 744 IDPANE_STATUS 745 IDPANE_CAPS_INDICATOR 746 IDPANE_DHT 747 IDPANE_FILTER 748 IDS_TRYANOTHERPORT 749 IDS_DHTTRYANOTHERPORT 750 IDS_SAVEPROMPT 751 IDS_NA 752 HAL_HALITE 753 HAL_INF 754 HAL_COMPLETED_SUMMARY 755 HAL_DOWNLOAD_SUMMARY 756 HAL_DOWNLOADT_SUMMARY 757 HAL_PAYLOAD_SUMMARY 758 HAL_NAME_STATUS 759 HAL_TRANSFERED 760 HAL_REMAINING 761 HAL_RATE 762 HAL_DHT_ON 763 HAL_CSPLASH_ACT_MSG 764 HAL_CSPLASH_SHUTDOWN_MSG 765 HAL_ADDT_TITLE 766 HAL_DHT_OFF 767 HAL_IPFILTER_ON 768 HAL_IPFILTER_OFF 769 HAL_EVENT_STDEXP 770 HAL_DOWN_RATES 771 HAL_NOT_LISTENING 772 HAL_PORT_OPEN 773 HAL_VERSION_STRING 774 HAL_FOLDER_SELECT 775 HAL_TORRENT_TAB 776 HAL_PEERS_TAB 777 HAL_FILES_TAB 778 HAL_TRACKER_TAB 779 HAL_DEBUG_TAB 780 HAL_INCORRECT_ENCODING_LEVEL 781 HAL_INCORRECT_CONNECT_POLICY 782 HAL_AUTOSORT 783 HAL_TORRENT_ROOT 784 HAL_WINDOW_CLOSECONFRIM 785 HAL_WINDOW_SOCKETS_FAILED 743 HAL_NEW_PANE_DLG "Construct a New Torrent" 744 IDPANE_STATUS "(D-U) 0000.000KB/s - 0000.000KB/s" 745 IDPANE_CAPS_INDICATOR "CAPS" 746 IDPANE_DHT "0000 DHT node(s)" 747 IDPANE_FILTER "Filtering 0000000 ranges." 748 IDS_TRYANOTHERPORT "The BitTorrent session could not start. Try selecting another port in the settings." 749 IDS_DHTTRYANOTHERPORT "DHT session could not start. Try selecting another port in the settings." 750 IDS_SAVEPROMPT "Select a directory to save the files to or cancel to not download torrent at all." 751 IDS_NA "N/A" 752 HAL_HALITE "Halite" 753 HAL_INF "∞" 754 HAL_COMPLETED_SUMMARY "%1$.2fMB of %2$.2fMB" 755 HAL_DOWNLOAD_SUMMARY "This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." 756 HAL_DOWNLOADT_SUMMARY "Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." 757 HAL_PAYLOAD_SUMMARY "Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." 758 HAL_NAME_STATUS "%1%, %2%." 759 HAL_TRANSFERED "%1$.2fMB down - %2$.2fMB up" 760 HAL_REMAINING "%1$.2fMB of %2$.2fMB" 761 HAL_RATE "%1$.2fKB/s down - %2$.2fKB/s up" 762 HAL_DHT_ON "%1% DHT node(s)" 763 HAL_CSPLASH_ACT_MSG "%1% active torrent(s)" 764 HAL_CSPLASH_SHUTDOWN_MSG "Shutting down session" 765 HAL_ADDT_TITLE "Edit Torrent Save Folders" 766 HAL_DHT_OFF "DHT disabled" 767 HAL_IPFILTER_ON "Filtering %1% range(s)" 768 HAL_IPFILTER_OFF "IP filter disabled" 769 HAL_EVENT_STDEXP "Standard exception (%1%) thrown from %2%." 770 HAL_DOWN_RATES "(D-U) %1$.2fKB/s - %2$.2fKB/s" 771 HAL_NOT_LISTENING "Halite not listening!" 772 HAL_PORT_OPEN "Port %1% open" 773 HAL_VERSION_STRING HALITE_VERSION_STRING 774 HAL_FOLDER_SELECT "Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." 775 HAL_TORRENT_TAB "Torrent" 776 HAL_PEERS_TAB "Peers" 777 HAL_FILES_TAB "Files" 778 HAL_TRACKER_TAB "Tracker" 779 HAL_DEBUG_TAB "Logging" 780 HAL_INCORRECT_ENCODING_LEVEL "An invalid encoding level, %1%, was passed as an encryption setting." 781 HAL_INCORRECT_CONNECT_POLICY "An invalid connection policy, %1%, was passed as an encryption setting." 782 HAL_AUTOSORT "Auto Sort" 783 HAL_TORRENT_ROOT "Torrent Root" 784 HAL_WINDOW_CLOSECONFRIM "Are you sure you wish to close Halite? Doing so will stop any active torrents" 785 HAL_WINDOW_SOCKETS_FAILED "The socket infrastructure failed to start so Halite is forced to close. Please ensure no program is blocking Halites network access." 786 786 HAL_SAVE_TEXT "Save" 787 787 HAL_LISTVIEW_CONFIRMDELETE "Are you sure you wish to delete all downloaded data?" … … 850 850 HAL_NTPLVM_NAMES "URL;Port;Type" 851 851 852 HAL_FILE_PRIORITY_0 "Don't download"853 HAL_FILE_PRIORITY_1 "Normal"854 HAL_FILE_PRIORITY_2 "2"855 HAL_FILE_PRIORITY_3 "3"856 HAL_FILE_PRIORITY_4 "4"857 HAL_FILE_PRIORITY_5 "Above Normal"858 HAL_FILE_PRIORITY_6 "6"859 HAL_FILE_PRIORITY_7 "Maximum"852 HAL_FILE_PRIORITY_0 "Don't download" 853 HAL_FILE_PRIORITY_1 "Normal" 854 HAL_FILE_PRIORITY_2 "2" 855 HAL_FILE_PRIORITY_3 "3" 856 HAL_FILE_PRIORITY_4 "4" 857 HAL_FILE_PRIORITY_5 "Above Normal" 858 HAL_FILE_PRIORITY_6 "6" 859 HAL_FILE_PRIORITY_7 "Maximum" 860 860 END 861 861 -
trunk/src/HaliteDialog.cpp
r582 r634 107 107 string torrentName = hal::to_utf8(torrent->name()); 108 108 109 if (!hal::bittorrent().is TorrentActive(torrentName))109 if (!hal::bittorrent().is_torrent_active(torrentName)) 110 110 { 111 111 SetDlgItemText(BTNPAUSE,L"Pause"); 112 hal::bittorrent().resume Torrent(torrentName);112 hal::bittorrent().resume_torrent(torrentName); 113 113 } 114 114 else 115 115 { 116 116 SetDlgItemText(BTNPAUSE,L"Resume"); 117 hal::bittorrent().pause Torrent(torrentName);117 hal::bittorrent().pause_torrent(torrentName); 118 118 } 119 119 … … 125 125 { 126 126 if (hal::torrent_details_ptr torrent = hal::bittorrent().torrentDetails().focusedTorrent()) 127 hal::bittorrent().reannounce Torrent(hal::to_utf8(torrent->name()));127 hal::bittorrent().reannounce_torrent(hal::to_utf8(torrent->name())); 128 128 } 129 129 -
trunk/src/HaliteListView.cpp
r618 r634 199 199 { 200 200 std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 201 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::resume Torrent,201 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::resume_torrent, 202 202 &hal::bittorrent(), _1)); 203 203 … … 208 208 { 209 209 std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 210 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::pause Torrent,210 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::pause_torrent, 211 211 &hal::bittorrent(), _1)); 212 212 … … 217 217 { 218 218 std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 219 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::stop Torrent,219 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::stop_torrent, 220 220 &hal::bittorrent(), _1)); 221 221 … … 245 245 { 246 246 std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 247 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::recheck Torrent,247 bind((void (hal::bit::*)(const std::wstring&))&hal::bit::recheck_torrent, 248 248 &hal::bittorrent(), _1)); 249 249 -
trunk/src/HaliteWindow.cpp
r632 r634 178 178 hal::event_log.post(shared_ptr<hal::EventDetail>( 179 179 new hal::EventMsg(L"Starting event reciever..."))); 180 hal::bittorrent().start EventReceiver();180 hal::bittorrent().start_event_receiver(); 181 181 hal::event_log.post(shared_ptr<hal::EventDetail>( 182 182 new hal::EventMsg(L"Initial setup complete!"))); … … 236 236 { 237 237 238 hal::SessionDetail details = hal::bittorrent().get SessionDetails();238 hal::SessionDetail details = hal::bittorrent().get_session_details(); 239 239 240 240 if (details.port > -1) -
trunk/src/advtabs/Files.hpp
r552 r634 110 110 struct Progress : public ColAdapter_t 111 111 { 112 virtual int compare(dataClass& l, dataClass& r) { return hal::compare(l.progress, r.progress); } 112 virtual int compare(dataClass& l, dataClass& r) { return hal::compare(static_cast<double>(l.progress)/l.size, 113 static_cast<double>(r.progress)/r.size); } 113 114 virtual std::wstring print(dataClass& t) 114 115 { 115 return (hal::wform(L"%1$.2f%%") % ( t.progress*100)).str();116 return (hal::wform(L"%1$.2f%%") % (static_cast<double>(t.progress)/t.size*100)).str(); 116 117 } 117 118 }; -
trunk/src/advtabs/Tracker.cpp
r531 r634 162 162 if (hal::bittorrent().torrentDetails().focusedTorrent()) 163 163 { 164 if (!hal::bittorrent().is TorrentActive(focusedTorrent()->name()))164 if (!hal::bittorrent().is_torrent_active(focusedTorrent()->name())) 165 165 { 166 hal::bittorrent().resume Torrent(focusedTorrent()->name());166 hal::bittorrent().resume_torrent(focusedTorrent()->name()); 167 167 } 168 168 else 169 169 { 170 hal::bittorrent().reannounce Torrent(focusedTorrent()->name());170 hal::bittorrent().reannounce_torrent(focusedTorrent()->name()); 171 171 } 172 172 } -
trunk/src/global/wtl_app.cpp
r578 r634 159 159 win_c_str<std::wstring> str(2048); 160 160 161 int size = ::LoadString(_Module.GetResourceInstance(), uID, str, str.size());161 size_t size = ::LoadString(_Module.GetResourceInstance(), uID, str, str.size()); 162 162 assert(size != 0); 163 163 -
trunk/src/halConfig.cpp
r633 r634 111 111 } 112 112 113 bittorrent().set SessionHalfOpenLimit(half_connections_limit_);113 bittorrent().set_session_half_open_limit(half_connections_limit_); 114 114 115 115 bittorrent().resume_all(); -
trunk/src/halSession.hpp
r633 r634 798 798 TIp->set_managed(managed); 799 799 TIp->setTransferSpeed(bittorrent().defTorrentDownload(), bittorrent().defTorrentUpload()); 800 TIp->set ConnectionLimit(bittorrent().defTorrentMaxConn(), bittorrent().defTorrentMaxUpload());800 TIp->set_connection_limit(bittorrent().defTorrentMaxConn(), bittorrent().defTorrentMaxUpload()); 801 801 } 802 802 … … 977 977 case torrent_details::torrent_active: 978 978 (*i).torrent->add_to_session(false); 979 (*i).torrent->resume(); 979 980 break; 980 981 default: -
trunk/src/halTorrent.cpp
r632 r634 38 38 if (!peerDetailsFilled_) 39 39 { 40 bittorrent().get AllPeerDetails(hal::to_utf8(name_), peerDetails_);40 bittorrent().get_all_peer_details(hal::to_utf8(name_), peerDetails_); 41 41 peerDetailsFilled_ = true; 42 42 } … … 49 49 if (!fileDetailsFilled_) 50 50 { 51 bittorrent().get AllFileDetails(hal::to_utf8(name_), fileDetails_);51 bittorrent().get_all_file_details(hal::to_utf8(name_), fileDetails_); 52 52 fileDetailsFilled_ = true; 53 53 } … … 228 228 } 229 229 230 const SessionDetail bit::get SessionDetails()230 const SessionDetail bit::get_session_details() 231 231 { 232 232 SessionDetail details; … … 248 248 } 249 249 250 void bit::set SessionHalfOpenLimit(int halfConn)250 void bit::set_session_half_open_limit(int halfConn) 251 251 { 252 252 pimpl->session_.set_max_half_open_connections(halfConn); … … 296 296 { 297 297 wstring utf8Name = (*i).torrent->name(); 298 torrent_details_ptr pT = (*i).torrent->get torrent_details_ptr();298 torrent_details_ptr pT = (*i).torrent->get_torrent_details_ptr(); 299 299 300 300 if (selected.find(utf8Name) != selected.end()) … … 390 390 } 391 391 392 void bit::get AllPeerDetails(const std::string& filename, PeerDetails& peerContainer)393 { 394 get AllPeerDetails(from_utf8_safe(filename), peerContainer);395 } 396 397 void bit::get AllPeerDetails(const std::wstring& filename, PeerDetails& peerContainer)392 void bit::get_all_peer_details(const std::string& filename, PeerDetails& peerContainer) 393 { 394 get_all_peer_details(from_utf8_safe(filename), peerContainer); 395 } 396 397 void bit::get_all_peer_details(const std::wstring& filename, PeerDetails& peerContainer) 398 398 { 399 399 try { … … 404 404 } 405 405 406 void bit::get AllFileDetails(const std::string& filename, FileDetails& fileDetails)407 { 408 get AllFileDetails(from_utf8_safe(filename), fileDetails);409 } 410 411 void bit::get AllFileDetails(const std::wstring& filename, FileDetails& fileDetails)406 void bit::get_all_file_details(const std::string& filename, FileDetails& fileDetails) 407 { 408 get_all_file_details(from_utf8_safe(filename), fileDetails); 409 } 410 411 void bit::get_all_file_details(const std::wstring& filename, FileDetails& fileDetails) 412 412 { 413 413 try { … … 418 418 } 419 419 420 bool bit::is Torrent(const std::string& filename)420 bool bit::is_torrent(const std::string& filename) 421 421 { 422 return is Torrent(hal::to_wstr_shim(filename));423 } 424 425 bool bit::is Torrent(const std::wstring& filename)422 return is_torrent(hal::to_wstr_shim(filename)); 423 } 424 425 bool bit::is_torrent(const std::wstring& filename) 426 426 { 427 427 try { … … 434 434 } 435 435 436 void bit::pause Torrent(const std::string& filename)437 { 438 pause Torrent(hal::to_wstr_shim(filename));439 } 440 441 void bit::pause Torrent(const std::wstring& filename)436 void bit::pause_torrent(const std::string& filename) 437 { 438 pause_torrent(hal::to_wstr_shim(filename)); 439 } 440 441 void bit::pause_torrent(const std::wstring& filename) 442 442 { 443 443 try { … … 448 448 } 449 449 450 void bit::resume Torrent(const std::string& filename)451 { 452 resume Torrent(hal::to_wstr_shim(filename));453 } 454 455 void bit::resume Torrent(const std::wstring& filename)450 void bit::resume_torrent(const std::string& filename) 451 { 452 resume_torrent(hal::to_wstr_shim(filename)); 453 } 454 455 void bit::resume_torrent(const std::wstring& filename) 456 456 { 457 457 try { … … 462 462 } 463 463 464 void bit::stop Torrent(const std::string& filename)465 { 466 stop Torrent(hal::to_wstr_shim(filename));467 } 468 469 void bit::stop Torrent(const std::wstring& filename)464 void bit::stop_torrent(const std::string& filename) 465 { 466 stop_torrent(hal::to_wstr_shim(filename)); 467 } 468 469 void bit::stop_torrent(const std::wstring& filename) 470 470 { 471 471 try { … … 476 476 } 477 477 478 bool bit::is TorrentActive(const std::string& filename)479 { 480 return is TorrentActive(hal::to_wstr_shim(filename));481 } 482 483 bool bit::is TorrentActive(const std::wstring& filename)478 bool bit::is_torrent_active(const std::string& filename) 479 { 480 return is_torrent_active(hal::to_wstr_shim(filename)); 481 } 482 483 bool bit::is_torrent_active(const std::wstring& filename) 484 484 { 485 485 try { … … 492 492 } 493 493 494 void bit::reannounce Torrent(const std::string& filename)495 { 496 reannounce Torrent(hal::to_wstr_shim(filename));497 } 498 499 void bit::reannounce Torrent(const std::wstring& filename)494 void bit::reannounce_torrent(const std::string& filename) 495 { 496 reannounce_torrent(hal::to_wstr_shim(filename)); 497 } 498 499 void bit::reannounce_torrent(const std::wstring& filename) 500 500 { 501 501 try { … … 507 507 508 508 509 void bit::recheck Torrent(const std::string& filename)510 { 511 recheck Torrent(hal::to_wstr_shim(filename));512 } 513 514 void bit::recheck Torrent(const std::wstring& filename)509 void bit::recheck_torrent(const std::string& filename) 510 { 511 recheck_torrent(hal::to_wstr_shim(filename)); 512 } 513 514 void bit::recheck_torrent(const std::wstring& filename) 515 515 { 516 516 try { … … 618 618 try { 619 619 620 return ptr->get ConnectionLimit();620 return ptr->get_connection_limit(); 621 621 622 622 } HAL_GENERIC_TORRENT_PROP_EXCEPTION_CATCH("torrent::get_connection_limits") … … 629 629 try { 630 630 631 ptr->set ConnectionLimit(l.first, l.second);631 ptr->set_connection_limit(l.first, l.second); 632 632 633 633 } HAL_GENERIC_TORRENT_PROP_EXCEPTION_CATCH("torrent::set_connection_limits") … … 638 638 try { 639 639 640 return ptr->get TransferSpeed();640 return ptr->get_transfer_speed(); 641 641 642 642 } HAL_GENERIC_TORRENT_PROP_EXCEPTION_CATCH("torrent::get_rate_limits") … … 698 698 try { 699 699 700 return ptr->get TrackerLogin();700 return ptr->get_tracker_login(); 701 701 702 702 } HAL_GENERIC_TORRENT_PROP_EXCEPTION_CATCH("get_tracker_login") … … 709 709 try { 710 710 711 ptr->set TrackerLogin(p.first, p.second);711 ptr->set_tracker_login(p.first, p.second); 712 712 713 713 } HAL_GENERIC_TORRENT_PROP_EXCEPTION_CATCH("torrent::set_tracker_login") … … 740 740 try { 741 741 742 return ptr->get Trackers();742 return ptr->get_trackers(); 743 743 744 744 } HAL_GENERIC_TORRENT_PROP_EXCEPTION_CATCH("torrent::get_trackers") … … 803 803 } 804 804 805 void bit::start EventReceiver()805 void bit::start_event_receiver() 806 806 { 807 807 event_log.post(shared_ptr<EventDetail>(new EventMsg(L"Starting event handler."))); -
trunk/src/halTorrent.hpp
r632 r634 886 886 void clear_ip_filter(); 887 887 888 void set SessionHalfOpenLimit(int halfConn);888 void set_session_half_open_limit(int halfConn); 889 889 void set_session_limits(int maxConn, int maxUpload); 890 890 void set_session_speed(float download, float upload); … … 901 901 cache_settings get_cache_settings() const; 902 902 903 const SessionDetail get SessionDetails();903 const SessionDetail get_session_details(); 904 904 905 905 void set_torrent_defaults(const connections& defaults); … … 908 908 boost::filesystem::wpath moveToDirectory=L"", bool useMoveTo=false); 909 909 910 void get AllPeerDetails(const std::string& filename, PeerDetails& peerContainer);911 void get AllPeerDetails(const std::wstring& filename, PeerDetails& peerContainer);912 void get AllFileDetails(const std::string& filename, FileDetails& fileDetails);913 void get AllFileDetails(const std::wstring& filename, FileDetails& fileDetails);910 void get_all_peer_details(const std::string& filename, PeerDetails& peerContainer); 911 void get_all_peer_details(const std::wstring& filename, PeerDetails& peerContainer); 912 void get_all_file_details(const std::string& filename, FileDetails& fileDetails); 913 void get_all_file_details(const std::wstring& filename, FileDetails& fileDetails); 914 914 915 915 void resume_all(); 916 916 void close_all(boost::optional<report_num_active> fn); 917 917 918 bool is Torrent(const std::string& filename);919 bool is Torrent(const std::wstring& filename);920 921 void pause Torrent(const std::string& filename);922 void pause Torrent(const std::wstring& filename);923 void resume Torrent(const std::string& filename);924 void resume Torrent(const std::wstring& filename);925 void stop Torrent(const std::string& filename);926 void stop Torrent(const std::wstring& filename);927 bool is TorrentActive(const std::string& filename);928 bool is TorrentActive(const std::wstring& filename);929 void reannounce Torrent(const std::string& filename);930 void reannounce Torrent(const std::wstring& filename);931 void recheck Torrent(const std::string& filename);932 void recheck Torrent(const std::wstring& filename);918 bool is_torrent(const std::string& filename); 919 bool is_torrent(const std::wstring& filename); 920 921 void pause_torrent(const std::string& filename); 922 void pause_torrent(const std::wstring& filename); 923 void resume_torrent(const std::string& filename); 924 void resume_torrent(const std::wstring& filename); 925 void stop_torrent(const std::string& filename); 926 void stop_torrent(const std::wstring& filename); 927 bool is_torrent_active(const std::string& filename); 928 bool is_torrent_active(const std::wstring& filename); 929 void reannounce_torrent(const std::string& filename); 930 void reannounce_torrent(const std::wstring& filename); 931 void recheck_torrent(const std::string& filename); 932 void recheck_torrent(const std::wstring& filename); 933 933 934 934 void pause_all_torrents(); … … 947 947 } 948 948 949 void start EventReceiver();949 void start_event_receiver(); 950 950 void stop_event_receiver(); 951 951 -
trunk/src/halTorrentDefines.hpp
r616 r634 7 7 #pragma once 8 8 9 #define HALITE_VERSION 0, 3, 1, 52510 #define HALITE_VERSION_STRING "v 0.3.1. 5 dev 604"11 #define HALITE_FINGERPRINT "HL", 0, 3, 1, 59 #define HALITE_VERSION 0, 3, 1, 633 10 #define HALITE_VERSION_STRING "v 0.3.1.6 dev 633" 11 #define HALITE_FINGERPRINT "HL", 0, 3, 1, 6 12 12 13 13 #ifndef HAL_NA -
trunk/src/halTorrentInternal.hpp
r633 r634 323 323 public: 324 324 #define TORRENT_INTERNALS_DEFAULTS \ 325 original Filename_(L""), \326 transfer Limit_(std::pair<float, float>(-1, -1)), \325 original_filename_(L""), \ 326 transfer_limit_(std::pair<float, float>(-1, -1)), \ 327 327 connections_(-1), \ 328 328 uploads_(-1), \ … … 363 363 #undef TORRENT_INTERNALS_DEFAULTS 364 364 365 torrent_details_ptr get torrent_details_ptr()365 torrent_details_ptr get_torrent_details_ptr() 366 366 { 367 367 mutex_t::scoped_lock l(mutex_); … … 489 489 { 490 490 event_log.post(shared_ptr<EventDetail>( 491 new EventInvalidTorrent(event_logger::critical, event_logger::invalidTorrent, to_utf8(name_), "get torrent_details_ptr")));491 new EventInvalidTorrent(event_logger::critical, event_logger::invalidTorrent, to_utf8(name_), "get_torrent_details_ptr"))); 492 492 } 493 493 catch (const std::exception& e) 494 494 { 495 495 event_log.post(shared_ptr<EventDetail>( 496 new EventTorrentException(event_logger::critical, event_logger::torrentException, e.what(), to_utf8(name_), "get torrent_details_ptr")));496 new EventTorrentException(event_logger::critical, event_logger::torrentException, e.what(), to_utf8(name_), "get_torrent_details_ptr"))); 497 497 } 498 498 … … 530 530 mutex_t::scoped_lock l(mutex_); 531 531 532 transfer Limit_ = std::make_pair(down, up);532 transfer_limit_ = std::make_pair(down, up); 533 533 534 534 apply_transfer_speed(); 535 535 } 536 536 537 void set ConnectionLimit(int maxConn, int maxUpload)537 void set_connection_limit(int maxConn, int maxUpload) 538 538 { 539 539 mutex_t::scoped_lock l(mutex_); … … 545 545 } 546 546 547 std::pair<float, float> get TransferSpeed()548 { 549 return transfer Limit_;550 } 551 552 std::pair<int, int> get ConnectionLimit()547 std::pair<float, float> get_transfer_speed() 548 { 549 return transfer_limit_; 550 } 551 552 std::pair<int, int> get_connection_limit() 553 553 { 554 554 return std::make_pair(connections_, uploads_); … … 647 647 try 648 648 { 649 650 mutex_t::scoped_lock l(mutex_); 651 assert(in_session()); 652 653 HAL_DEV_MSG(hal::wform(L"remove_from_session() writeData=%1%") % write_data); 649 HAL_DEV_MSG(hal::wform(L"remove_from_session() write_data=%1%") % write_data); 650 651 mutex_t::scoped_lock l(mutex_); 652 if (!in_session()) 653 { 654 in_session_ = false; 655 HAL_DEV_MSG(L"Was not is session!"); 656 657 return false; 658 } 654 659 655 660 if (write_data) … … 902 907 } 903 908 904 void set TrackerLogin(wstring username, wstring password)905 { 906 tracker Username_ = username;907 tracker Password_ = password;909 void set_tracker_login(wstring username, wstring password) 910 { 911 tracker_username_ = username; 912 tracker_password_ = password; 908 913 909 914 apply_tracker_login(); 910 915 } 911 916 912 std::pair<wstring, wstring> get TrackerLogin() const913 { 914 return make_pair(tracker Username_, trackerPassword_);917 std::pair<wstring, wstring> get_tracker_login() const 918 { 919 return make_pair(tracker_username_, tracker_password_); 915 920 } 916 921 917 922 const wstring& filename() const { return filename_; } 918 923 919 const wstring& original Filename() const { return originalFilename_; }924 const wstring& original_filename() const { return original_filename_; } 920 925 921 926 const libt::torrent_handle& handle() const { return handle_; } … … 938 943 } 939 944 940 const std::vector<tracker_detail>& get Trackers()945 const std::vector<tracker_detail>& get_trackers() 941 946 { 942 947 if (trackers_.empty() && info_memory_) … … 973 978 974 979 if (version > 1) { 975 ar & make_nvp("transfer_limits", transfer Limit_);980 ar & make_nvp("transfer_limits", transfer_limit_); 976 981 ar & make_nvp("connection_limits", connections_); 977 982 ar & make_nvp("upload_limits", uploads_); … … 987 992 ar & make_nvp("resolve_countries", resolve_countries_); 988 993 989 ar & make_nvp("tracker_username", tracker Username_);990 ar & make_nvp("tracker_password", tracker Password_);994 ar & make_nvp("tracker_username", tracker_username_); 995 ar & make_nvp("tracker_password", tracker_password_); 991 996 ar & make_nvp("trackers", trackers_); 992 997 … … 1010 1015 else 1011 1016 { 1012 ar & make_nvp("transferLimit", transfer Limit_);1017 ar & make_nvp("transferLimit", transfer_limit_); 1013 1018 ar & make_nvp("connections", connections_); 1014 1019 ar & make_nvp("uploads", uploads_); … … 1032 1037 ar & make_nvp("downloaded_", downloaded_); 1033 1038 ar & make_nvp("ratio", ratio_); 1034 ar & make_nvp("trackerUsername", tracker Username_);1035 ar & make_nvp("trackerPassword", tracker Password_);1039 ar & make_nvp("trackerUsername", tracker_username_); 1040 ar & make_nvp("trackerPassword", tracker_password_); 1036 1041 1037 1042 ar & make_nvp("state", state_); … … 1054 1059 } 1055 1060 1056 void set EntryData(boost::intrusive_ptr<libt::torrent_info> metadata, libtorrent::entry resumedata)1061 void set_entry_data(boost::intrusive_ptr<libt::torrent_info> metadata, libtorrent::entry resumedata) 1057 1062 { 1058 1063 info_memory_ = metadata; … … 1153 1158 info_memory_ = new libt::torrent_info(path_to_utf8(filename)); 1154 1159 1155 extract Names(info_memory());1160 extract_names(info_memory()); 1156 1161 1157 1162 const wpath resumeFile = hal::app().get_working_directory()/L"resume"/filename_; … … 1181 1186 } 1182 1187 1183 void extract Names(boost::intrusive_ptr<libt::torrent_info> metadata)1188 void extract_names(boost::intrusive_ptr<libt::torrent_info> metadata) 1184 1189 { 1185 1190 mutex_t::scoped_lock l(mutex_); … … 1229 1234 if (in_session()) 1230 1235 { 1231 int down = (transfer Limit_.first > 0) ? static_cast<int>(transferLimit_.first*1024) : -1;1236 int down = (transfer_limit_.first > 0) ? static_cast<int>(transfer_limit_.first*1024) : -1; 1232 1237 handle_.set_download_limit(down); 1233 1238 1234 int up = (transfer Limit_.second > 0) ? static_cast<int>(transferLimit_.second*1024) : -1;1239 int up = (transfer_limit_.second > 0) ? static_cast<int>(transfer_limit_.second*1024) : -1; 1235 1240 handle_.set_upload_limit(up); 1236 1241 … … 1292 1297 if (in_session()) 1293 1298 { 1294 if (tracker Username_ != L"")1299 if (tracker_username_ != L"") 1295 1300 { 1296 handle_.set_tracker_login(hal::to_utf8(tracker Username_),1297 hal::to_utf8(tracker Password_));1301 handle_.set_tracker_login(hal::to_utf8(tracker_username_), 1302 hal::to_utf8(tracker_password_)); 1298 1303 } 1299 1304 1300 HAL_DEV_MSG(hal::wform(L"Applying Tracker Login User: %1%, Pass: %2%") % tracker Username_ % trackerPassword_ );1305 HAL_DEV_MSG(hal::wform(L"Applying Tracker Login User: %1%, Pass: %2%") % tracker_username_ % tracker_password_ ); 1301 1306 } 1302 1307 } … … 1438 1443 torrent_state_machine machine_; 1439 1444 1440 std::pair<float, float> transfer Limit_;1445 std::pair<float, float> transfer_limit_; 1441 1446 1442 1447 mutable unsigned state_; … … 1451 1456 wpath save_directory_; 1452 1457 wpath move_to_directory_; 1453 wstring original Filename_;1458 wstring original_filename_; 1454 1459 libt::torrent_handle handle_; 1455 1460 … … 1457 1462 // boost::shared_ptr<libt::entry> resumedata_; 1458 1463 1459 wstring tracker Username_;1460 wstring tracker Password_;1464 wstring tracker_username_; 1465 wstring tracker_password_; 1461 1466 1462 1467 boost::int64_t totalUploaded_;
Note: See TracChangeset
for help on using the changeset viewer.