API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jul 20th, 2017
59
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 10.25 KB | None | 0 0
raw download clone embed print report
  1. === modified file 'dcpp/LogManager.cpp'
  2. --- dcpp/LogManager.cpp 2011-01-02 17:12:02 +0000
  3. +++ dcpp/LogManager.cpp 2011-02-08 18:57:04 +0000
  4. @@ -87,6 +87,8 @@
  5.     options[UPLOAD][FORMAT]     = SettingsManager::LOG_FORMAT_POST_UPLOAD;
  6.     options[DOWNLOAD][FILE]     = SettingsManager::LOG_FILE_DOWNLOAD;
  7.     options[DOWNLOAD][FORMAT]   = SettingsManager::LOG_FORMAT_POST_DOWNLOAD;
  8. +   options[FINISHED_DOWNLOAD][FILE] = SettingsManager::LOG_FILE_FINISHED_DOWNLOAD;
  9. +   options[FINISHED_DOWNLOAD][FORMAT] = SettingsManager::LOG_FORMAT_POST_FINISHED_DOWNLOAD;
  10.     options[CHAT][FILE]     = SettingsManager::LOG_FILE_MAIN_CHAT;
  11.     options[CHAT][FORMAT]       = SettingsManager::LOG_FORMAT_MAIN_CHAT;
  12.     options[PM][FILE]       = SettingsManager::LOG_FILE_PRIVATE_CHAT;
  13.  
  14. === modified file 'dcpp/LogManager.h'
  15. --- dcpp/LogManager.h   2011-01-02 17:12:02 +0000
  16. +++ dcpp/LogManager.h   2011-02-08 18:57:11 +0000
  17. @@ -32,7 +32,7 @@
  18.     typedef pair<time_t, string> Pair;
  19.     typedef deque<Pair> List;
  20.  
  21. -   enum Area { CHAT, PM, DOWNLOAD, UPLOAD, SYSTEM, STATUS, LAST };
  22. +   enum Area { CHAT, PM, DOWNLOAD, FINISHED_DOWNLOAD, UPLOAD, SYSTEM, STATUS, LAST };
  23.     enum { FILE, FORMAT };
  24.  
  25.     void log(Area area, StringMap& params) throw();
  26.  
  27. === modified file 'dcpp/QueueManager.cpp'
  28. --- dcpp/QueueManager.cpp   2011-01-02 17:12:02 +0000
  29. +++ dcpp/QueueManager.cpp   2011-02-08 19:39:19 +0000
  30. @@ -1137,6 +1137,7 @@
  31.                         }
  32.  
  33.                         string dir;
  34. +                       bool crcError = false;
  35.                         if(aDownload->getType() == Transfer::TYPE_FULL_LIST) {
  36.                             dir = q->getTempTarget();
  37.                             q->addSegment(Segment(0, q->getSize()));
  38. @@ -1144,7 +1145,7 @@
  39.                             q->addSegment(aDownload->getSegment());
  40.  
  41.                             if (q->isFinished() && BOOLSETTING(SFV_CHECK)) {
  42. -                               checkSfv(q, aDownload);
  43. +                               crcError = checkSfv(q, aDownload);
  44.                             }
  45.                         }
  46.  
  47. @@ -1154,6 +1155,10 @@
  48.                                 moveFile(aDownload->getTempTarget(), aDownload->getPath());
  49.                             }
  50.  
  51. +                           if (BOOLSETTING(LOG_FINISHED_DOWNLOADS) && aDownload->getType() == Transfer::TYPE_FILE) {
  52. +                               logFinishedDownload(q, aDownload, crcError);
  53. +                           }
  54. +
  55.                             fire(QueueManagerListener::Finished(), q, dir, aDownload->getAverageSpeed());
  56.  
  57.                             userQueue.remove(q);
  58. @@ -1710,7 +1715,7 @@
  59.     }
  60.  }
  61.  
  62. -void QueueManager::checkSfv(QueueItem* qi, Download* d) {
  63. +bool QueueManager::checkSfv(QueueItem* qi, Download* d) {
  64.     SFVReader sfv(qi->getTarget());
  65.  
  66.     if(sfv.hasCRC()) {
  67. @@ -1739,12 +1744,13 @@
  68.             }
  69.  
  70.             fire(QueueManagerListener::CRCFailed(), d, _("CRC32 inconsistency (SFV-Check)"));
  71. -           return;
  72. +           return true;
  73.         }
  74.  
  75.         dcdebug("QueueManager: CRC32 match for %s\n", qi->getTarget().c_str());
  76.         fire(QueueManagerListener::CRCChecked(), d);
  77.     }
  78. +   return false;
  79.  }
  80.  
  81.  uint32_t QueueManager::calcCrc32(const string& file) throw(FileException) {
  82. @@ -1760,4 +1766,15 @@
  83.     return f.getFilter().getValue();
  84.  }
  85.  
  86. +void QueueManager::logFinishedDownload(QueueItem* qi, Download* d, bool crcError)
  87. +{
  88. +   StringMap params;
  89. +   params["target"] = qi->getTarget();
  90. +   params["fileSI"] = Util::toString(qi->getSize());
  91. +   params["fileSIshort"] = Util::formatBytes(qi->getSize());
  92. +   params["fileTR"] = qi->getTTH().toBase32();
  93. +   params["sfv"] = Util::toString(crcError ? 1 : 0);
  94. +
  95. +   LOG(LogManager::FINISHED_DOWNLOAD, params);
  96. +}
  97.  } // namespace dcpp
  98.  
  99. === modified file 'dcpp/QueueManager.h'
  100. --- dcpp/QueueManager.h 2011-01-02 17:12:02 +0000
  101. +++ dcpp/QueueManager.h 2011-02-08 18:57:35 +0000
  102. @@ -258,9 +258,11 @@
  103.  
  104.     string getListPath(const HintedUser& user);
  105.  
  106. -   void checkSfv(QueueItem* qi, Download* d);
  107. +   bool checkSfv(QueueItem* qi, Download* d);
  108.     uint32_t calcCrc32(const string& file) throw(FileException);
  109.  
  110. +   void logFinishedDownload(QueueItem* qi, Download* d, bool crcError);
  111. +
  112.     // TimerManagerListener
  113.     virtual void on(TimerManagerListener::Second, uint64_t aTick) throw();
  114.     virtual void on(TimerManagerListener::Minute, uint64_t aTick) throw();
  115.  
  116. === modified file 'dcpp/SettingsManager.cpp'
  117. --- dcpp/SettingsManager.cpp    2011-02-01 20:32:13 +0000
  118. +++ dcpp/SettingsManager.cpp    2011-02-08 19:37:20 +0000
  119. @@ -44,11 +44,11 @@
  120.     "FinishedDLFilesOrder", "FinishedDLFilesWidths", "FinishedDLUsersOrder", "FinishedDLUsersWidths",
  121.     "FinishedULFilesOrder", "FinishedULFilesWidths", "FinishedULUsersOrder", "FinishedULUsersWidths",
  122.     "UsersFrameOrder", "UsersFrameWidths", "HttpProxy", "LogDirectory", "LogFormatPostDownload",
  123. -   "LogFormatPostUpload", "LogFormatMainChat", "LogFormatPrivateChat",
  124. +   "LogFormatPostFinishedDownload", "LogFormatPostUpload", "LogFormatMainChat", "LogFormatPrivateChat",
  125.     "TempDownloadDirectory", "BindAddress", "SocksServer", "SocksUser", "SocksPassword", "ConfigVersion",
  126.     "DefaultAwayMessage", "TimeStampsFormat", "ADLSearchFrameOrder", "ADLSearchFrameWidths",
  127. -   "CID", "SpyFrameWidths", "SpyFrameOrder", "LogFileMainChat",
  128. -   "LogFilePrivateChat", "LogFileStatus", "LogFileUpload", "LogFileDownload", "LogFileSystem",
  129. +   "CID", "SpyFrameWidths", "SpyFrameOrder", "LogFileMainChat", "LogFilePrivateChat",
  130. +   "LogFileStatus", "LogFileUpload", "LogFileDownload", "LogFileFinishedDownload", "LogFileSystem",
  131.     "LogFormatSystem", "LogFormatStatus", "DirectoryListingFrameOrder", "DirectoryListingFrameWidths",
  132.     "TLSPrivateKeyFile", "TLSCertificateFile", "TLSTrustedCertificatesPath",
  133.     "Language", "DownloadsOrder", "DownloadsWidth", "Toolbar", "LastSearchType",
  134. @@ -59,7 +59,7 @@
  135.     "BackgroundColor", "TextColor", "UseOemMonoFont", "ShareHidden", "FilterMessages", "MinimizeToTray", "AlwaysTray",
  136.     "AutoSearch", "TimeStamps", "PopupHubPms", "PopupBotPms", "IgnoreHubPms", "IgnoreBotPms",
  137.     "ListDuplicates", "BufferSize", "DownloadSlots", "MaxDownloadSpeed", "LogMainChat", "LogPrivateChat",
  138. -   "LogDownloads", "LogUploads", "StatusInChat", "ShowJoins",
  139. +   "LogDownloads", "LogFinishedDownloads", "LogUploads", "StatusInChat", "ShowJoins",
  140.     "UseSystemIcons", "PopupPMs", "MinUploadSpeed", "GetUserInfo", "UrlHandler", "MainWindowState",
  141.     "MainWindowSizeX", "MainWindowSizeY", "MainWindowPosX", "MainWindowPosY", "AutoAway",
  142.     "SocksPort", "SocksResolve", "KeepLists", "AutoKick", "QueueFrameShowTree",
  143. @@ -164,6 +164,7 @@
  144.     setDefault(LOG_DIRECTORY, Util::getPath(Util::PATH_USER_LOCAL) + "Logs" PATH_SEPARATOR_STR);
  145.     setDefault(LOG_UPLOADS, false);
  146.     setDefault(LOG_DOWNLOADS, false);
  147. +   setDefault(LOG_FINISHED_DOWNLOADS, true);
  148.     setDefault(LOG_PRIVATE_CHAT, false);
  149.     setDefault(LOG_MAIN_CHAT, false);
  150.     setDefault(STATUS_IN_CHAT, true);
  151. @@ -174,6 +175,7 @@
  152.     setDefault(POPUP_PMS, true);
  153.     setDefault(MIN_UPLOAD_SPEED, 0);
  154.     setDefault(LOG_FORMAT_POST_DOWNLOAD, "%Y-%m-%d %H:%M: %[target] " + string(_("downloaded from")) + " %[userNI] (%[userCID]), %[fileSI] (%[fileSIchunk]), %[speed], %[time], %[fileTR]");
  155. +   setDefault(LOG_FORMAT_POST_FINISHED_DOWNLOAD, "%Y-%m-%d %H:%M: %[target], %[fileSI], %[fileTR], %[sfv]");
  156.     setDefault(LOG_FORMAT_POST_UPLOAD, "%Y-%m-%d %H:%M: %[source] " + string(_("uploaded to")) + " %[userNI] (%[userCID]), %[fileSI] (%[fileSIchunk]), %[speed], %[time], %[fileTR]");
  157.     setDefault(LOG_FORMAT_MAIN_CHAT, "[%Y-%m-%d %H:%M] %[message]");
  158.     setDefault(LOG_FORMAT_PRIVATE_CHAT, "[%Y-%m-%d %H:%M] %[message]");
  159. @@ -184,6 +186,7 @@
  160.     setDefault(LOG_FILE_PRIVATE_CHAT, "%[userNI].%[userCID].log");
  161.     setDefault(LOG_FILE_UPLOAD, "Uploads.log");
  162.     setDefault(LOG_FILE_DOWNLOAD, "Downloads.log");
  163. +   setDefault(LOG_FILE_FINISHED_DOWNLOAD, "Finished_downloads.log");
  164.     setDefault(LOG_FILE_SYSTEM, "system.log");
  165.     setDefault(GET_USER_INFO, true);
  166.     setDefault(URL_HANDLER, false);
  167.  
  168. === modified file 'dcpp/SettingsManager.h'
  169. --- dcpp/SettingsManager.h  2011-01-02 17:12:02 +0000
  170. +++ dcpp/SettingsManager.h  2011-02-08 18:57:19 +0000
  171. @@ -62,12 +62,12 @@
  172.         FINISHED_DL_FILES_ORDER, FINISHED_DL_FILES_WIDTHS, FINISHED_DL_USERS_ORDER, FINISHED_DL_USERS_WIDTHS,
  173.         FINISHED_UL_FILES_ORDER, FINISHED_UL_FILES_WIDTHS, FINISHED_UL_USERS_ORDER, FINISHED_UL_USERS_WIDTHS,
  174.         USERSFRAME_ORDER, USERSFRAME_WIDTHS, HTTP_PROXY, LOG_DIRECTORY, LOG_FORMAT_POST_DOWNLOAD,
  175. -       LOG_FORMAT_POST_UPLOAD, LOG_FORMAT_MAIN_CHAT, LOG_FORMAT_PRIVATE_CHAT,
  176. +       LOG_FORMAT_POST_FINISHED_DOWNLOAD, LOG_FORMAT_POST_UPLOAD, LOG_FORMAT_MAIN_CHAT, LOG_FORMAT_PRIVATE_CHAT,
  177.         TEMP_DOWNLOAD_DIRECTORY, BIND_ADDRESS, SOCKS_SERVER, SOCKS_USER, SOCKS_PASSWORD, CONFIG_VERSION,
  178.         DEFAULT_AWAY_MESSAGE, TIME_STAMPS_FORMAT, ADLSEARCHFRAME_ORDER, ADLSEARCHFRAME_WIDTHS,
  179.         PRIVATE_ID, SPYFRAME_WIDTHS, SPYFRAME_ORDER, LOG_FILE_MAIN_CHAT,
  180. -       LOG_FILE_PRIVATE_CHAT, LOG_FILE_STATUS, LOG_FILE_UPLOAD, LOG_FILE_DOWNLOAD, LOG_FILE_SYSTEM,
  181. -       LOG_FORMAT_SYSTEM, LOG_FORMAT_STATUS, DIRECTORYLISTINGFRAME_ORDER, DIRECTORYLISTINGFRAME_WIDTHS,
  182. +       LOG_FILE_PRIVATE_CHAT, LOG_FILE_STATUS, LOG_FILE_UPLOAD, LOG_FILE_DOWNLOAD, LOG_FILE_FINISHED_DOWNLOAD,
  183. +       LOG_FILE_SYSTEM, LOG_FORMAT_SYSTEM, LOG_FORMAT_STATUS, DIRECTORYLISTINGFRAME_ORDER, DIRECTORYLISTINGFRAME_WIDTHS,
  184.         TLS_PRIVATE_KEY_FILE, TLS_CERTIFICATE_FILE, TLS_TRUSTED_CERTIFICATES_PATH,
  185.         LANGUAGE, DOWNLOADS_ORDER, DOWNLOADS_WIDTHS, TOOLBAR, LAST_SEARCH_TYPE,
  186.         SOUND_MAIN_CHAT, SOUND_PM, SOUND_PM_WINDOW,
  187. @@ -78,7 +78,7 @@
  188.         BACKGROUND_COLOR, TEXT_COLOR, USE_OEM_MONOFONT, SHARE_HIDDEN, FILTER_MESSAGES, MINIMIZE_TRAY, ALWAYS_TRAY,
  189.         AUTO_SEARCH, TIME_STAMPS, POPUP_HUB_PMS, POPUP_BOT_PMS, IGNORE_HUB_PMS, IGNORE_BOT_PMS,
  190.         LIST_DUPES, BUFFER_SIZE, DOWNLOAD_SLOTS, MAX_DOWNLOAD_SPEED, LOG_MAIN_CHAT, LOG_PRIVATE_CHAT,
  191. -       LOG_DOWNLOADS, LOG_UPLOADS, STATUS_IN_CHAT, SHOW_JOINS,
  192. +       LOG_DOWNLOADS, LOG_FINISHED_DOWNLOADS, LOG_UPLOADS, STATUS_IN_CHAT, SHOW_JOINS,
  193.         USE_SYSTEM_ICONS, POPUP_PMS, MIN_UPLOAD_SPEED, GET_USER_INFO, URL_HANDLER, MAIN_WINDOW_STATE,
  194.         MAIN_WINDOW_SIZE_X, MAIN_WINDOW_SIZE_Y, MAIN_WINDOW_POS_X, MAIN_WINDOW_POS_Y, AUTO_AWAY,
  195.         SOCKS_PORT, SOCKS_RESOLVE, KEEP_LISTS, AUTO_KICK, QUEUEFRAME_SHOW_TREE,
  196.  
  197. === modified file 'dcpp/Transfer.cpp'
  198. --- dcpp/Transfer.cpp   2011-01-02 17:12:02 +0000
  199. +++ dcpp/Transfer.cpp   2011-02-08 18:56:34 +0000
  200. @@ -87,8 +87,6 @@
  201.     params["hubURL"] = Util::toString(hubs);
  202.     params["fileSI"] = Util::toString(getSize());
  203.     params["fileSIshort"] = Util::formatBytes(getSize());
  204. -// params["fileSIchunk"] = Util::toString(getTotal());
  205. -// params["fileSIchunkshort"] = Util::formatBytes(getTotal());
  206.     params["fileSIactual"] = Util::toString(getActual());
  207.     params["fileSIactualshort"] = Util::formatBytes(getActual());
  208.     params["speed"] = Util::formatBytes(getAverageSpeed()) + "/s";
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!