diff --git a/.Rhistory b/.Rhistory new file mode 100644 index 0000000..e69de29 diff --git a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari index bcdebec..28e0cb2 100755 Binary files a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari and b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari differ diff --git a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.hi b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.hi index 16182b7..d48ec5e 100644 Binary files a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.hi and b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.hi differ diff --git a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.o b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.o index 4ea3747..7f0f465 100644 Binary files a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.o and b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/build/tajemnicaatari/tajemnicaatari-tmp/Main.o differ diff --git a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/stack-build-caches/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/exe-tajemnicaatari b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/stack-build-caches/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/exe-tajemnicaatari index 9486067..4568ac8 100644 --- a/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/stack-build-caches/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/exe-tajemnicaatari +++ b/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/stack-build-caches/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/exe-tajemnicaatari @@ -1,4 +1,4 @@ /home/arab/tajemnica-atari/shadow-library.cabal: hash: 714bd61ef22b868b423c5ab32edbbca76e241ecb2075dced142701878c34217a /home/arab/tajemnica-atari/app/tajemnicaatari.hs: - hash: bddee13012273b21b906bb8fbd691a21a711b4572235a59201b82b3843f2c862 + hash: d6d30253647c843a66123cc3a966da1ec5db47b670cfbccc24a2b7289493980c diff --git a/.stack-work/install/x86_64-linux-tinfo6/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/8.2.2/bin/tajemnicaatari b/.stack-work/install/x86_64-linux-tinfo6/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/8.2.2/bin/tajemnicaatari index 79723d2..342cf85 100755 Binary files a/.stack-work/install/x86_64-linux-tinfo6/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/8.2.2/bin/tajemnicaatari and b/.stack-work/install/x86_64-linux-tinfo6/d71b3e2454b12a341d631285d8a546a45a73f1e0125cdb4008bd2d9f7a6a35bf/8.2.2/bin/tajemnicaatari differ diff --git a/.stack-work/stack.sqlite3 b/.stack-work/stack.sqlite3 index 54e8a51..23c47ce 100644 Binary files a/.stack-work/stack.sqlite3 and b/.stack-work/stack.sqlite3 differ diff --git a/README.md b/README.md index 8f20846..637578a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ stack install Wynikiem pracy robota będzie zbiór elementów ShadowItem. Oto przypładowy rekord ShadowItem: ``` -ShadowItem {url = Just "http://krap.pl/mirrorz/atari/horror.mirage.com.pl/pixel/3_91/3_91_offline.zip", title = "Tajemnica Atari TA 3/91 DjVu OFFLINE (plik ZIP, 1.6MB)", itype = "periodical", originalDate = Just "3_91", creator = Nothing, format = Just "zip", lang = Just "pol", finalUrl = "http://krap.pl/mirrorz/atari/horror.mirage.com.pl/pixel/3_91/3_91_offline.zip", description = Nothing} +ShadowItem {url = Just "http://krap.pl/mirrorz/atari/horror.mirage.com.pl/pixel/4_91/4_91_offline.zip", title = "Tajemnica Atari TA 4/91 DjVu OFFLINE (plik ZIP, 1.9MB)", itype = "periodical", originalDate = Just "1991-4", creator = Nothing, format = Just "zip", lang = Just "pol", finalUrl = "http://krap.pl/mirrorz/atari/horror.mirage.com.pl/pixel/4_91/4_91_offline.zip", description = Nothing} ``` diff --git a/Robot_Haskell_Rafał_Sobański.txt b/Robot_Haskell_Rafał_Sobański.txt new file mode 100644 index 0000000..849befb --- /dev/null +++ b/Robot_Haskell_Rafał_Sobański.txt @@ -0,0 +1 @@ +https://git.wmi.amu.edu.pl/s470627/tajemnica-atari diff --git a/app/tajemnicaatari.hs b/app/tajemnicaatari.hs index 41b9dd9..3966653 100644 --- a/app/tajemnicaatari.hs +++ b/app/tajemnicaatari.hs @@ -11,6 +11,8 @@ import Data.List.Utils (replace) import Text.Regex.Posix import Text.Printf +import Data.List.Utils + extractRecords = extractLinksWithText "//a[@class='ramka']" -- pary adres-tytuł @@ -20,19 +22,21 @@ extractRecords = extractLinksWithText "//a[@class='ramka']" -- pary adres-tytu toShadowItem :: ((String, String), String) -> ShadowItem toShadowItem ((url, articleTitle), yearlyTitle) = (defaultShadowItem url title) { - originalDate = Just date, + originalDate = Just newFormatDate, itype = "periodical", format = Just "zip", finalUrl = url } where title = "Tajemnica Atari " ++ yearlyTitle ++ " " ++ (replace "\r\n" "" (replace "\r\n " "" articleTitle)) date = getDate url + splitDate = split "_" date + newFormatDate = "19" ++ splitDate !! 1 ++ "-" ++splitDate !! 0 getDate url = case url =~~ "/([1-9]_9[0-9]|1[0-2]_9[0-9]|[1-9]-[1-9]_9[0-9]|1[0-2]-1[0-2]_9[0-9])/" :: Maybe [[String]] of Just [[_, year]] -> year otherwise -> error $ "unexpected url: " ++ url - + main = do let start = "http://krap.pl/mirrorz/atari/horror.mirage.com.pl/pixel/"