currency_converteralarmingautosfxaysaliacalllibchecksum-toolscolormanagercryptochatdecoderdelphiutilsdistributeddpcstudiodpg2fastphpfileformatsfilter_foundryforestgridgameht46f47_simulatorindexer_suiteipe_artfile_utilsjavautilsjumperlightgamelogviewermusikboxmystic_houseoidconverteroidinfo_apioidinfo_new_designoidpluspersonal-webbasephp_antispamphp_clientchallengephp_guestbookphp_utilsplumbersprependrecyclebinunitsimple_log_eventsokobanspacemissionstackmanuserdetect2uuid_mac_utilsvgwhoisvnagwebcounterwinbugtrackeryt_downloader

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/ @ 16

  → /trunk/ @ 17

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 16 → Rev 17

/trunk/RTL/VtsCurConv.pas
317,11 → 317,16
procedure _HandleKeyInvalidOrMissing(cacheFileName: string; msg: string; out doRetry: boolean; out json: string);
resourcestring
S_ENTER_NEW_KEY = 'Do you want to enter a new one?';
S_NO_CACHE_EXISTING = 'Cannot get the data online, and no cache exists. Please check your internet connection and API key.';
begin
if FallBackToCache then
begin
if not InteractiveAPIKeyInput then
begin
if not FileExists(cacheFileName) then
begin
raise Exception.Create(S_NO_CACHE_EXISTING);
end;
json := FileGetContents(cacheFileName);
doRetry := false;
end
334,6 → 339,10
end
else
begin
if not FileExists(cacheFileName) then
begin
raise Exception.Create(S_NO_CACHE_EXISTING);
end;
json := FileGetContents(cacheFileName);
doRetry := false;
end;
353,28 → 362,34
end;
end;
function protocol: string;
begin
if Secure then result := 'https' else result := 'http';
end;
function url: string;
var
sJSON, msg, protocol: string;
xRoot: TlkJSONobject;
xSuccess: TlkJSONboolean;
keyInvalid, doRetry: boolean;
sDate: string;
url: string;
cacheDirName, cacheFileName: string;
needDownload: boolean;
mTime: TDateTime;
begin
if HistoricDate = 0 then
begin
sDate := '';
result := protocol + '://www.apilayer.net/api/live?access_key=' + ReadAPIKey;
end
else
begin
DateTimeToString(sDate, 'YYYY-MM-DD', HistoricDate);
result := protocol + '://www.apilayer.net/api/historical?date=' + sDate + '&access_key=' + ReadAPIKey;
end;
end;
function cacheFileName: string;
resourcestring
S_CANNOT_CREATE_DIR = 'Cannot create directory %s';
S_INVALID_MAXAGE = 'Invalid maxage';
S_NO_API_KEY_PROVIDED = 'No API key provided.';
S_DOWNLOAD_QUERY = 'Download %s to %s ?';
S_JSON_FILE_INVALID = 'JSON file invalid';
S_UNKNOWN_SUCCESS = 'Cannot determinate status of the query.';
S_JSON_UNKNOWN_ERROR = 'Unknown error while loading JSON.';
S_API_KEY_INVALID = 'API key invalid.';
var
sDate: string;
cacheDirName: string;
begin
try
{$REGION 'Determinate file location and URL'}
// cacheDirName := IncludeTrailingPathDelimiter(GetSpecialPath(CSIDL_PROGRAM_FILES_COMMON)) + 'ViaThinkSoft\CurrencyConverter\';
cacheDirName := IncludeTrailingPathDelimiter(GetTempDir) + 'ViaThinkSoft\CurrencyConverter\';
if not ForceDirectories(cacheDirName) then
382,21 → 397,35
raise EVtsCurConvException.CreateFmt(S_CANNOT_CREATE_DIR, [cacheDirName]);
end;
if Secure then protocol := 'https' else protocol := 'http';
if HistoricDate = 0 then
begin
sDate := '';
url := protocol + '://www.apilayer.net/api/live?access_key=' + ReadAPIKey;
cacheFileName := IncludeTrailingPathDelimiter(cacheDirName) + 'live.json';
result := IncludeTrailingPathDelimiter(cacheDirName) + 'live.json';
end
else
begin
DateTimeToString(sDate, 'YYYY-MM-DD', HistoricDate);
url := protocol + '://www.apilayer.net/api/historical?date=' + sDate + '&access_key=' + ReadAPIKey;
cacheFileName := IncludeTrailingPathDelimiter(cacheDirName) + 'historical-' + sDate + '.json';
result := IncludeTrailingPathDelimiter(cacheDirName) + 'historical-' + sDate + '.json';
end;
{$ENDREGION}
end;
var
sJSON, msg: string;
xRoot: TlkJSONobject;
xSuccess: TlkJSONboolean;
keyInvalid, doRetry: boolean;
needDownload: boolean;
mTime: TDateTime;
resourcestring
S_INVALID_MAXAGE = 'Invalid maxage';
S_NO_API_KEY_PROVIDED = 'No API key provided.';
S_DOWNLOAD_QUERY = 'Download %s to %s ?';
S_JSON_FILE_INVALID = 'JSON file invalid';
S_UNKNOWN_SUCCESS = 'Cannot determinate status of the query.';
S_JSON_UNKNOWN_ERROR = 'Unknown error while loading JSON.';
S_API_KEY_INVALID = 'API key invalid.';
begin
try
{$REGION 'Determinate if we need to download or not'}
if HistoricDate = 0 then
begin
428,7 → 457,7
end;
{$ENDREGION}
if not needDownload then
if not needDownload and FileExists(cacheFileName) then
begin
sJSON := FileGetContents(cacheFileName);
end
453,7 → 482,7
{$REGION 'Confirm web access?'}
if ConfirmWebAccess and (MessageDlg(Format(S_DOWNLOAD_QUERY, [url, cacheFileName]), mtConfirmation, mbYesNoCancel, 0) <> ID_YES) then
begin
if FallBackToCache then
if FallBackToCache and FileExists(cacheFileName) then
begin
result := FileGetContents(cacheFileName);
Exit;
501,7 → 530,7
end
else // if not keyInvalid then
begin
if FallBackToCache then
if FallBackToCache and FileExists(cacheFileName) then
begin
result := FileGetContents(cacheFileName);
Exit;