WebSVN – currency_converter – Diff – /trunk/RTL/VtsCurConv.pas

 function TVtsCurConv.GetJsonRaw(HistoricDate: TDate=0): string;
   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
       else
       begin
           QueryAPIKey;
           doRetry := true;
         end
         else
         begin
+          if not FileExists(cacheFileName) then
+          begin
+            raise Exception.Create(S_NO_CACHE_EXISTING);
+          end;
           json := FileGetContents(cacheFileName);
           doRetry := false;
         end;
       end;
     end
         doRetry := true;
       end;
     end;
   end;
+  function protocol: string;
+  begin
+    if Secure then result := 'https' else result := 'http';
+  end;
+  function url: string;
-var
+  var
-  sJSON, msg, protocol: string;
-  xRoot: TlkJSONobject;
-  xSuccess: TlkJSONboolean;
-  keyInvalid, doRetry: boolean;
-  sDate: string;
+    sDate: string;
-  url: string;
+  begin
-  cacheDirName, cacheFileName: string;
+    if HistoricDate = 0 then
-  needDownload: boolean;
+    begin
-  mTime: TDateTime;
+      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
+  resourcestring
-  S_CANNOT_CREATE_DIR = 'Cannot create directory %s';
+    S_CANNOT_CREATE_DIR = 'Cannot create directory %s';
-  S_INVALID_MAXAGE = 'Invalid maxage';
+  var
-  S_NO_API_KEY_PROVIDED = 'No API key provided.';
-  S_DOWNLOAD_QUERY = 'Download %s to %s ?';
+    sDate: string;
-  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.';
+    cacheDirName: string;
-begin
+  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
     begin
       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;
-    end;
+  end;
-    {$ENDREGION}
+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
       needDownload := true;
       if MaxAgeSeconds < -1 then
     begin
       needDownload := not FileExists(cacheFileName)
     end;
     {$ENDREGION}
-    if not needDownload then
+    if not needDownload and FileExists(cacheFileName) then
     begin
       sJSON := FileGetContents(cacheFileName);
     end
     else
     begin
       {$REGION 'Download and check if everything is OK'}
       repeat
         {$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;
           end
           else Abort;
           begin
             _HandleKeyInvalidOrMissing(cacheFileName, S_API_KEY_INVALID, doRetry, sJSON);
           end
           else // if not keyInvalid then
           begin
-            if FallBackToCache then
+            if FallBackToCache and FileExists(cacheFileName) then
             begin
               result := FileGetContents(cacheFileName);
               Exit;
             end
             else

Subversion Repositories currency_converter

currency_converter/trunk/RTL/VtsCurConv.pas – Rev 16 → 17