geek 1.1.0.1 → 1.1.1.0

raw patch · 6 files changed

+11/−39 lines, 6 filesdep −old-locale

Dependencies removed: old-locale

Files

• Nemesis +0/−29
• geek.cabal +3/−6
• src/Web/Geek/Application.hs +4/−0
• src/Web/Geek/Config.hs +1/−1
• src/Web/Geek/Post.hs +1/−1
• src/Web/Geek/RSS.hs +2/−2

@@ -1,29 +0,0 @@-import Air.Env-import Prelude ()-import System.Nemesis.Env-import System.Nemesis.Titan--main = run - do--  clean-    [-      "**/*.o"-    , "**/*.hi"-    ]---  desc "prepare cabal dist"-  task "dist" - do-    sh "cabal clean"-    sh "cabal configure"-    sh "cabal sdist"--  titan "Main.hs"---  task "t:Main/titan" - return ()---  desc "console"-  task "i" - do-    sh "ghci -isrc src/Web/Geek/Serve.hs"

@@ -1,19 +1,16 @@ Name:                 geek-Version:              1.1.0.1+Version:              1.1.1.0 Build-type:           Simple Synopsis:             Geek blog engine-Description:          A dynamic blog engine, customizable with standard web technology, i.e. HTML, CSS and Javascript (JSON)+Description:          A dynamic blog engine, customizable with standard web technology  License:              BSD3 License-file:         LICENSE Author:               Jinjing Wang Maintainer:           Jinjing Wang <nfjinjing@gmail.com>-Build-Depends:        base Cabal-version:        >= 1.6 category:             Web homepage:             http://github.com/nfjinjing/geek-data-files:-                      Nemesis  Library   ghc-options:        -W@@ -35,7 +32,7 @@                     , hack2-contrib                     , miku                     , mtl-                    , old-locale+                    -- , old-locale                     , process                     , random                     , safe

@@ -132,6 +132,10 @@                  .to_list +          puts - show _query_tokens+          puts - show _matched_post_ids_for_tokens+          puts - show _matched_post_ids_set_list+           return - matched_post_ids.map (\_id -> _posts.at _id) .catMaybes.sortBy (compare `on` date).reverse      text_params :: AppMonadT [(Text, Text)]

@@ -18,7 +18,7 @@ import System.Directory (doesFileExist) import System.Environment (getArgs) import System.Exit (exitWith, ExitCode(..))-import System.Locale (defaultTimeLocale)+-- import System.Locale (defaultTimeLocale)  import Text.Printf import Web.Geek.DefaultConfig

@@ -16,7 +16,7 @@ import Data.Time import GHC.Exts( IsString(..) ) import System.FilePath-import System.Locale+-- import System.Locale import Web.Geek.Config import Web.Geek.Type import qualified Data.Text as T

@@ -20,8 +20,8 @@ import qualified Data.Text as T import Data.Maybe import Control.Monad (forM_)-import System.Locale (defaultTimeLocale)-import Data.Time (formatTime)+-- import System.Locale (defaultTimeLocale)+import Data.Time (formatTime, defaultTimeLocale) import Data.Char (isSpace)    {-