[v1.5][F14-B4] Bibliotek

.circleci/config.yml

@@ -0,0 +1,15 @@
+version: 2
+jobs:
+   build:
+     docker:
+       - image: takuyakanbr/bibliotek-ci:latest
+     steps:
+       - checkout
+       - run:
+           name: Repository-wide checks
+           command: './config/travis/run-checks.sh'
+       - run:
+           name: Test
+           command: 'gradle checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor'
+       - store_test_results:
+           path: build/test-results

.gitignore

@@ -11,6 +11,7 @@ lib/*
 config.json
 src/test/data/sandbox/
 preferences.json
+recentbooks.xml
 .DS_Store
 ./screenshot*.png
 classes/

.travis.yml

@@ -3,9 +3,11 @@ matrix:
   include:
     - jdk: oraclejdk8
 
+install: true
+
 script: >-
     ./config/travis/run-checks.sh &&
-    travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
+    travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests asciidoctor
 
 deploy:
   skip_cleanup: true
@@ -22,6 +24,8 @@ addons:
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
 
 cache:
   directories:

README.adoc

@@ -1,11 +1,17 @@
-= Address Book (Level 4)
+= Bibliotek
 ifdef::env-github,env-browser[:relfileprefix: docs/]
 
-https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
-https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
-https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
-https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
-https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
+https://circleci.com/gh/CS2103JAN2018-F14-B4/main/tree/master[image:https://img.shields.io/circleci/project/github/CS2103JAN2018-F14-B4/main.svg?label=circleci[Build Status]]
+https://travis-ci.org/CS2103JAN2018-F14-B4/main[image:https://img.shields.io/travis/CS2103JAN2018-F14-B4/main.svg?label=travis[Build Status]]
+https://ci.appveyor.com/project/takuyakanbr/main[image:https://img.shields.io/appveyor/ci/takuyakanbr/main.svg?label=appveyor[Build Status]]
+https://coveralls.io/github/CS2103JAN2018-F14-B4/main?branch=master[image:https://img.shields.io/coveralls/github/CS2103JAN2018-F14-B4/main.svg[Coverage Status]]
+https://www.codacy.com/app/takuyakanbr/main[image:https://img.shields.io/codacy/grade/aa9140dcebbd474c9dc16c57fe247e78.svg[Codacy Badge]]
+https://github.com/CS2103JAN2018-F14-B4/main/blob/master/LICENSE[image:https://img.shields.io/badge/license-MIT-blue.svg[License]]
+
+Bibliotek is a free book cataloguing application that is simple, fast, and easy to use. It is targeted at
+heavy readers who require a hassle-free way of managing and keep tracking of their read and unread books.
+
+You can download Bibliotek for free from our https://github.com/CS2103JAN2018-F14-B4/main/releases/latest[releases page].
 
 ifdef::env-github[]
 image::docs/images/Ui.png[width="600"]
@@ -15,26 +21,28 @@ ifndef::env-github[]
 image::images/Ui.png[width="600"]
 endif::[]
 
-* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
-* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
-* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
-* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
-** A more sophisticated GUI that includes a list  panel and an in-built Browser.
-** More test cases, including automated GUI testing.
-** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
+== Features
+
+* Runs on all mainstream OS
+* Uses short and simple commands for user interactions
+* Provides a GUI to display lists and details of books
+* Search online for new books and add them with a command
+* Prioritize, rate, and mark books as reading, read, or unread
+* View book reviews
+* View availability of books in the library
 
 == Site Map
 
 * <<UserGuide#, User Guide>>
 * <<DeveloperGuide#, Developer Guide>>
-* <<LearningOutcomes#, Learning Outcomes>>
 * <<AboutUs#, About Us>>
 * <<ContactUs#, Contact Us>>
 
 == Acknowledgements
 
-* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
+* This application is built upon the https://github.com/se-edu/addressbook-level4[AddressBook-Level4] project created by https://github.com/se-edu[SE-EDU] initiative.
+* Some parts of this application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
 _Marco Jakob_.
-* Libraries used: https://github.com/TomasMikula/EasyBind[EasyBind], https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit4[JUnit4]
+* Libraries used: https://github.com/AsyncHttpClient/async-http-client[AsyncHttpClient], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/google/guava[Guava], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit4[JUnit4], https://github.com/mockito/mockito[Mockito], https://github.com/TestFX/TestFX[TextFX]
 
 == Licence : link:LICENSE[MIT]

appveyor.yml

@@ -1,6 +1,14 @@
 # AppVeyor configuration file
 # For more details see https://www.appveyor.com/docs/build-configuration/
 
+image: Visual Studio 2017
+
+platform:
+    - x64
+
+environment:
+    JAVA_HOME: C:\Program Files\Java\jdk1.8.0  # Use 64-bit Java
+
 # Call on gradle to build and run tests
 # --no-daemon: Prevent the daemon from launching to prevent file-in-use errors
 #     when we cache the ~/.gradle directory
@@ -10,8 +18,21 @@ build_script:
 test_script:
     - appveyor-retry gradlew.bat --no-daemon headless allTests
 
-environment:
-    JAVA_HOME: C:\Program Files\Java\jdk1.8.0  # Use 64-bit Java
+# upload test results via rest-api
+on_finish:
+    - ps: |
+          $wc = New-Object 'System.Net.WebClient'
+          $url = "https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)"
+          $files = Get-ChildItem '.\build\test-results\test\TEST-*.xml'
+          ForEach ($file in $files) {
+              $wc.UploadFile($url, (Resolve-Path $file))
+          }
+
+on_success:
+    - ps: rm C:\Users\appveyor\.gradle\caches\modules-2\modules-2.lock -force
+    - ps: rm C:\Users\appveyor\.gradle\caches\*\plugin-resolution\ -recurse -force
+    - ps: rm C:\Users\appveyor\.gradle\caches\*\fileHashes\fileHashes.bin -recurse -force
+    - ps: rm C:\Users\appveyor\.gradle\caches\*\fileHashes\fileHashes.lock -recurse -force
 
 # Files/folders to preserve between builds to speed them up
 cache:

build.gradle

@@ -9,8 +9,8 @@ plugins {
     id 'java'
     id 'jacoco'
     id 'checkstyle'
-    id "com.github.kt3k.coveralls" version "2.4.0"
-    id "com.github.johnrengelman.shadow" version '1.2.3'
+    id "com.github.kt3k.coveralls" version "2.8.2"
+    id "com.github.johnrengelman.shadow" version '2.0.2'
     id 'org.asciidoctor.convert' version '1.5.6'
     id 'application'
 }
@@ -30,40 +30,42 @@ checkstyle {
     toolVersion = '8.1'
 }
 
+jacoco {
+    toolVersion = '0.8.0'
+}
+
 jacocoTestReport {
     reports {
         xml.enabled false
         csv.enabled false
-        html.destination "${buildDir}/jacocoHtml"
+        html.destination file("${buildDir}/jacocoHtml")
     }
 }
 
 dependencies {
-    String testFxVersion = '4.0.7-alpha'
+    String testFxVersion = '4.0.13-alpha'
 
-    compile group: 'org.fxmisc.easybind', name: 'easybind', version: '1.0.3'
-    compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
-    compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
-    compile group: 'com.google.guava', name: 'guava', version: '19.0'
+    compile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.4.3'
+    compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.14'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4'
+    compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.9.4'
+    compile group: 'com.google.guava', name: 'guava', version: '23.0'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.16.0'
     testCompile group: 'org.testfx', name: 'testfx-core', version: testFxVersion
     testCompile group: 'org.testfx', name: 'testfx-junit', version: testFxVersion
-    testCompile group: 'org.testfx', name: 'testfx-legacy', version: testFxVersion, {
-        exclude group: 'junit', module: 'junit'
-    }
-    testCompile group: 'org.testfx', name: 'openjfx-monocle', version: '1.8.0_20'
+    testCompile group: 'org.testfx', name: 'openjfx-monocle', version: '8u76-b04'
 }
 
 shadowJar {
-    archiveName = "addressbook.jar"
+    archiveName = "bibliotek.jar"
 
     destinationDir = file("${buildDir}/jar/")
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.12'
+    gradleVersion = '4.6'
 }
 
 task coverage(type: JacocoReport) {
@@ -105,6 +107,11 @@ allTests.dependsOn guiTests
 allTests.dependsOn nonGuiTests
 
 test {
+    test.maxParallelForks = Math.min(System.env.'CI' ? 2 : 4, Runtime.runtime.availableProcessors())
+    minHeapSize = "512m"
+    maxHeapSize = "1200m"
+    jvmArgs '-Xmx1200m'
+
     systemProperty 'testfx.setup.timeout', '60000'
 
     /*
@@ -146,14 +153,16 @@ test {
     }
 }
 
-task headless << {
-    println "Setting headless mode properties."
-    test {
-        systemProperty 'java.awt.robot', 'true'
-        systemProperty 'testfx.robot', 'glass'
-        systemProperty 'testfx.headless', 'true'
-        systemProperty 'prism.order', 'sw'
-        systemProperty 'prism.text', 't2k'
+task headless {
+    doLast {
+        println "Setting headless mode properties."
+        test {
+            systemProperty 'java.awt.robot', 'true'
+            systemProperty 'testfx.robot', 'glass'
+            systemProperty 'testfx.headless', 'true'
+            systemProperty 'prism.order', 'sw'
+            systemProperty 'prism.text', 't2k'
+        }
     }
 }
 
@@ -166,13 +175,13 @@ asciidoctor {
     outputDir "${buildDir}/docs"
 
     attributes linkcss: true,
-               stylesheet: 'gh-pages.css',
-               'source-highlighter': 'coderay',
-               icons: 'font',
-               experimental: true,
-               sectlinks: true,
-               idprefix: '',  // for compatibility with GitHub preview
-               idseparator: '-'
+            stylesheet: 'gh-pages.css',
+            'source-highlighter': 'coderay',
+            icons: 'font',
+            experimental: true,
+            sectAnchors: true,
+            idprefix: '',  // for compatibility with GitHub preview
+            idseparator: '-'
 }
 
 /*
@@ -196,12 +205,21 @@ task deployOfflineDocs(type: Copy) {
     }
 }
 
-task copyDummySearchPage(type: Copy) {
-    from 'docs/DummySearchPage.html'
-    into "${buildDir}/docs/html5"
-}
-
 deployOfflineDocs.dependsOn asciidoctor
 processResources.dependsOn deployOfflineDocs
 
+task download {
+    description "Pre-downloads most dependencies"
+    doLast {
+        configurations.getAsMap().each { name, config ->
+            println "Retrieving dependencies for $name"
+            try {
+                config.files
+            } catch (e) {
+                // skip
+            }
+        }
+    }
+}
+
 defaultTasks 'clean', 'headless', 'allTests', 'coverage', 'asciidoctor'

collated/functional/592363789-reused.md

@@ -0,0 +1,85 @@
+# 592363789-reused
+###### \java\seedu\address\logic\CipherEngine.java
+``` java
+    /**
+     *  Encrypting files
+     */
+    public static void encryptFile(String path) {
+        try {
+            file = path;
+            FileInputStream fis = new FileInputStream(path);
+            FileOutputStream fos = new FileOutputStream("data/change.xml");
+            enDecrypt(defaultKey, Cipher.ENCRYPT_MODE, fis, fos);
+            File temp = new File(file);
+            temp.delete();
+            changeName("data/change.xml");
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     *  Decrypting files
+     */
+    public static void decryptFile(String path) {
+        try {
+            file = path;
+            FileInputStream fis = new FileInputStream(path);
+            FileOutputStream fos = new FileOutputStream("data/change.xml");
+            enDecrypt(defaultKey, Cipher.DECRYPT_MODE, fis, fos);
+            File temp = new File(file);
+            temp.delete();
+            changeName("data/change.xml");
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Encrypt or Decrypt method
+     */
+    public static void enDecrypt(String key, int mode, InputStream inputStream, OutputStream outputStream)
+            throws Throwable {
+
+        DESKeySpec desKeySpec = new DESKeySpec(key.getBytes());
+        SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("DES");
+        SecretKey desKey = secretKeyFactory.generateSecret(desKeySpec);
+        Cipher cipher = Cipher.getInstance("DES"); // DES/ECB/PKCS5Padding for SunJCE
+
+        if (mode == Cipher.ENCRYPT_MODE) {
+            cipher.init(Cipher.ENCRYPT_MODE, desKey);
+            CipherInputStream cipherInputStream = new CipherInputStream(inputStream, cipher);
+            hiding(cipherInputStream, outputStream);
+        } else if (mode == Cipher.DECRYPT_MODE) {
+            cipher.init(Cipher.DECRYPT_MODE, desKey);
+            CipherOutputStream cipherOutputStream = new CipherOutputStream(outputStream, cipher);
+            hiding(inputStream, cipherOutputStream);
+        }
+    }
+
+    /**
+     *  Cover the file (hiding the normal file)
+     */
+    public static void hiding(InputStream inputStream, OutputStream outputStream) throws IOException {
+        byte[] bytes = new byte[64];
+        int num;
+        while ((num = inputStream.read(bytes)) != -1) {
+            outputStream.write(bytes, 0, num);
+        }
+        outputStream.flush();
+        outputStream.close();
+        inputStream.close();
+    }
+
+    /**
+     * replace the file
+     */
+    public static boolean changeName(String from) {
+
+        File f0 = new File(from);
+        File f1 = new File(file);
+
+        return f0.renameTo(f1);
+
+    }
+```