GUI: check for news counting CRC of News.txt (returned by CheckNews.a…

…spx) git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@664 3a4f7f31-9599-433d-91b1-573e8b61252c
abandonware · Oct 10, 2009 · 532d29d · 532d29d
1 parent d0c726d
commit 532d29d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/Documentation/History.txt b/Documentation/History.txt
@@ -358,7 +358,6 @@
   translate the "Gb" and "Mb" and "kb" fields or dropdown entries that are not yet translatable...
   translate the about box
 mm/tta/?external: BigAlloc; tornado: use BigAlloc ��� ������������ ���� �� ������� ���-�����
-������������ ��� �������� �� ������� crc ������, ������������ ��������� CheckNews.aspx
 fashell
   250 vars in Lua stack?
   ��������� � �������� � unicode-������� � BOM � ������ ������� (�������� ����� luaL_dofile)
@@ -476,7 +475,6 @@ other
        TC: ��� ���������� FreeArc.exe ����������� ����� no-url\FreeArc.exe
          arc x a FreeArc.exe  -  rar ��������� ������ ���� ���� (*.exe ��������� ��� �����)
 
-  URL support: dynamic dlls in order to cutoff rep:1g errors
   testmem and correct method before starting single_compress (?? - ����������� ���������� ������
     ���������� ����� �� ������� ������)
   ��� ������ ���������� ��������������� �����:

diff --git a/FileManager.hs b/FileManager.hs
@@ -804,29 +804,27 @@ myGUI run args = do
                                    ++ "&largest%20memory%20block=" ++ showMem (maxBlock `roundDown` (100*mb))
                                    ++ "&number%20of%20cores=" ++ show getProcessorsCount
                                    ++ "&language=" ++ urlEncode language
-            --gui$ fmStackMsg fm' url
-            ignoreErrors (fileGetBinary url >> return ())
-          -- Ïðîâåðèì ñòðàíèöó íîâîñòåé
-          handleErrors
-            -- Âûïîëíÿåòñÿ ïðè íåäîñòóïíîñòè ñòðàíèöû íîâîñòåé
-            (when manual$ postGUIAsync$ do
-                msg <- i18n"0296 Cannot open %1. Do you want to check the page with browser?"
-                whenM (askOkCancel window (format msg newsURL)) $ do
-                  openWebsite newsURL)
-            -- Ïîïûòêà ïðî÷èòàòü ñòðàíèöó íîâîñòåé
-            (fileGetBinary newsURL >>== (`showHex` "").crc32) $ \new_crc -> do
-          -- Ñòðàíèöà íîâîñòåé óñïåøíî ïðî÷èòàíà
-          old_crc <- fmGetHistory1 fm' "news_crc" ""
-          postGUIAsync$ do
-          fmStackMsg fm' ""
-          if (new_crc == old_crc) then do
-             msg <- i18n"0297 Nothing new at %1"
-             manual &&& fmInfoMsg fm' (format msg newsURL)
-           else do
-             fmReplaceHistory fm' "news_crc" new_crc
-             msg <- i18n"0298 Found new information at %1! Open the page with browser?"
-             whenM (askOkCancel window (format msg newsURL)) $ do
-               openWebsite newsURL
+            -- Ñîîáùàåì ñòàòèñòèêó è ïðîâåðÿåì ñòðàíèöó íîâîñòåé
+            handleErrors
+              -- Âûïîëíÿåòñÿ ïðè íåäîñòóïíîñòè ñòðàíèöû
+              (when manual$ postGUIAsync$ do
+                  msg <- i18n"0296 Cannot open %1. Do you want to check the page with browser?"
+                  whenM (askOkCancel window (format msg newsURL)) $ do
+                    openWebsite newsURL)
+              -- Ïîïûòêà ïðî÷èòàòü ñòðàíèöó
+              (fileGetBinary url >>== (`showHex` "").crc32) $ \new_crc -> do
+            -- Ñòðàíèöà íîâîñòåé óñïåøíî ïðî÷èòàíà
+            old_crc <- fmGetHistory1 fm' "news_crc" ""
+            postGUIAsync$ do
+            fmStackMsg fm' ""
+            if (new_crc == old_crc) then do
+               msg <- i18n"0297 Nothing new at %1"
+               manual &&& fmInfoMsg fm' (format msg newsURL)
+             else do
+               fmReplaceHistory fm' "news_crc" new_crc
+               msg <- i18n"0298 Found new information at %1! Open the page with browser?"
+               whenM (askOkCancel window (format msg newsURL)) $ do
+                 openWebsite newsURL
 
   -- Äâàæäû â ÷àñ ïðîâåðÿòü îòñóòñòâèå íîâîñòåé
   forkIO_ $ do

diff --git a/Options.hs b/Options.hs
@@ -322,11 +322,11 @@ aARCHIVE_VERSION = make4byte 0 0 5 9
 {-# NOINLINE aARC_WEBSITE #-}
 {-# NOINLINE aARC_LICENSE #-}
 -- |Краткое наименование программы, выводимое в начале работы
-aARC_VERSION_WITH_DATE = aARC_VERSION ++ " ("++aARC_DATE++")"    -- aARC_VERSION
-aARC_HEADER_WITH_DATE  = aARC_HEADER  ++ " ("++aARC_DATE++")"    -- aARC_HEADER
+aARC_VERSION_WITH_DATE = aARC_VERSION                    -- aARC_VERSION ++ " ("++aARC_DATE++")"
+aARC_HEADER_WITH_DATE  = aARC_HEADER                     -- aARC_HEADER  ++ " ("++aARC_DATE++")"
 aARC_HEADER  = aARC_NAME++" "++aARC_VERSION++" "
-aARC_VERSION = "0.60 RC2"                                        --  "0.60 RC ("++aARC_DATE++")"
-aARC_DATE    = "October 7 2009"
+aARC_VERSION = "0.60 RC ("++aARC_DATE++")"               --  "0.60 RC"
+aARC_DATE    = "October 10 2009"
 aARC_NAME    = "FreeArc"
 aARC_AUTHOR  = "Bulat Ziganshin"
 aARC_EMAIL   = "Bulat.Ziganshin@gmail.com"