Update default plagiarism directory (#45)

* Update default plagiarism directory

* Move away from clunky Submitty path-base system

Author: chameco

lichen.cabal

@@ -35,7 +35,6 @@ library
                      , Lichen.Plagiarism.Render
                      , Lichen.Plagiarism.Render.Index
                      , Lichen.Plagiarism.Render.Compare
-                     , Lichen.Plagiarism.Render.PathGenerators
                      , Lichen.Count.Main
                      , Lichen.Count.Counters
                      , Lichen.Diagnostics.Main
@@ -57,7 +56,6 @@ library
                      , blaze-markup
                      , clay
                      , jmacro
-                     , text-format
   ghc-options:         -Wall -fwarn-incomplete-patterns
   default-language:    Haskell2010
 

src/Lichen/Config/Plagiarism.hs

@@ -6,9 +6,29 @@ import Data.Maybe
 import Data.Aeson
 import qualified Data.Text as T
 
+import qualified Text.Blaze.Html5 as H
+
 import Lichen.Config
 import Lichen.Config.Languages
-import Lichen.Plagiarism.Render.PathGenerators
+
+newtype PathGenerator = PathGenerator { runPathGenerator :: Config -> String -> String -> H.AttributeValue }
+instance FromJSON PathGenerator where
+        parseJSON (String s) = pure $ generatePathChoice generatePathSubmitty (Just $ T.unpack s)
+        parseJSON _ = pure generatePathSubmitty
+
+generatePathStatic :: PathGenerator
+generatePathStatic = PathGenerator $ \_ x y -> H.stringValue $ "compare/" ++ x ++ "_" ++ y ++ ".html"
+
+generatePathSubmitty :: PathGenerator
+generatePathSubmitty = PathGenerator $ \c x y -> H.stringValue $ mconcat [ "index.php?semester=", submittySemester c
+                                                                         , "&course=", submittyCourse c
+                                                                         , "&assignment=", submittyAssignment c
+                                                                         , "&component=admin&page=plagiarism&action=compare&studenta=", x, "&studentb=", y ]
+
+generatePathChoice :: PathGenerator -> Maybe String -> PathGenerator
+generatePathChoice d Nothing = d
+generatePathChoice _ (Just "static") = generatePathStatic
+generatePathChoice _ _ = generatePathSubmitty
 
 data Config = Config
             { dataDir :: FilePath
@@ -19,7 +39,9 @@ data Config = Config
             , language :: Language
             , topMatches :: Int
             , pathGenerator :: PathGenerator
-            , pathBase :: FilePath
+            , submittySemester :: FilePath
+            , submittyCourse :: FilePath
+            , submittyAssignment :: FilePath
             , sourceDir :: Maybe FilePath
             , pastDirs :: [FilePath]
             }
@@ -33,21 +55,25 @@ instance FromJSON Config where
             language <- fromMaybe (language defaultConfig) <$> o .:? "language"
             topMatches <- fromMaybe (topMatches defaultConfig) <$> o .:? "top_matches"
             pathGenerator <- fromMaybe (pathGenerator defaultConfig) <$> o .:? "path_generator"
-            pathBase <- fromMaybe (pathBase defaultConfig) <$> o .:? "path_base"
+            submittySemester <- fromMaybe (submittySemester defaultConfig) <$> o .:? "submitty_semester"
+            submittyCourse <- fromMaybe (submittyCourse defaultConfig) <$> o .:? "submitty_course"
+            submittyAssignment <- fromMaybe (submittyAssignment defaultConfig) <$> o .:? "submitty_assignment"
             sourceDir <- fromMaybe (sourceDir defaultConfig) <$> o .:? "source_dir"
             pastDirs <- fromMaybe (pastDirs defaultConfig) <$> o .:? "past_dirs"
             return Config{..}
 
 defaultConfig :: Config
-defaultConfig = Config { dataDir = ".lichen"
+defaultConfig = Config { dataDir = "plagiarism"
                        , concatDir = "concatenated"
                        , highlightDir = "highlighted"
                        , reportDir = "report"
                        , reportTitle = "Plagiarism Detection"
                        , language = langDummy
                        , topMatches = 100
                        , pathGenerator = generatePathSubmitty
-                       , pathBase = ""
+                       , submittySemester = "invalid"
+                       , submittyCourse = "invalid"
+                       , submittyAssignment = "invalid"
                        , sourceDir = Nothing
                        , pastDirs = []
                        }

src/Lichen/Plagiarism/Main.hs

@@ -24,7 +24,6 @@ import Lichen.Plagiarism.Concatenate
 import Lichen.Plagiarism.Highlight
 import Lichen.Plagiarism.Report
 import Lichen.Plagiarism.Walk
-import Lichen.Plagiarism.Render.PathGenerators
 
 parseOptions :: Config -> Parser Config
 parseOptions dc = Config
@@ -36,7 +35,9 @@ parseOptions dc = Config
                <*> (languageChoice (language dc) <$> (optional . strOption $ long "language" <> short 'l' <> metavar "LANG" <> help "Language of student code"))
                <*> option auto (long "top-matches" <> short 't' <> metavar "N" <> showDefault <> value (topMatches dc) <> help "Number of top matches to report")
                <*> (generatePathChoice (pathGenerator dc) <$> (optional . strOption $ long "path-generator" <> metavar "GENERATOR" <> help "Path generation method for reports"))
-               <*> strOption (long "path-base" <> metavar "BASE" <> value (pathBase dc) <> help "Base to prepend to report paths")
+               <*> strOption (long "semester" <> metavar "SEMESTER" <> value (submittySemester dc) <> help "Semester for Submitty path generation")
+               <*> strOption (long "course" <> metavar "COURSE" <> value (submittyCourse dc) <> help "Course for Submitty path generation")
+               <*> strOption (long "assignment" <> metavar "ASSIGNMENT" <> value (submittyAssignment dc) <> help "Assignment for Submitty path generation")
                <*> optional (argument str (metavar "SOURCE_DIR"))
                <*> many (argument str (metavar "PAST_DIRS"))
 

src/Lichen/Plagiarism/Render/Index.hs

@@ -14,11 +14,9 @@ import Numeric
 import Lichen.Util
 import Lichen.Config.Plagiarism
 import Lichen.Plagiarism.Render
-import Lichen.Plagiarism.Render.PathGenerators
 
 renderEntry :: Show a => Config -> (Double, (b, a), (b, a)) -> H.Html
-renderEntry config (match, (_, x), (_, y)) = H.tr (H.td (H.a ! A.href (H.stringValue (pathBase config)
-                                                                       <> runPathGenerator (pathGenerator config) (sq x) (sq y)) $ H.toHtml $ showFFloat (Just 2) (match * 100) "%")
+renderEntry config (match, (_, x), (_, y)) = H.tr (H.td (H.a ! A.href (runPathGenerator (pathGenerator config) config (sq x) (sq y)) $ H.toHtml $ showFFloat (Just 2) (match * 100) "%")
                                                    <> H.td (hs x) <> H.td (hs y))
 
 renderTable :: Show a => Config -> [(Double, (b, a), (b, a))] -> H.Html