Skip to content

Mobi drm check #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjacob wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Mobi drm check #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f431605
Added support for DRM checking MOBI and AZW files.
sjacob Sep 4, 2015
8726bda
Added support for DRM checks of mobi files.
sjacob Sep 7, 2015
895acad
Added some for mobi book fields to the parser.
sjacob Sep 9, 2015
a616925
Enabled support for Calibre on OS X.
sjacob Oct 29, 2015
865ad93
Added a system parameter to enable/disable the calibre processing.
sjacob Nov 4, 2015
cf92bf0
Fixed a NullPointerException when processing an EPub file for a second
sjacob Nov 4, 2015
43f7761
Updated the application to delete temporary files as soon as possible
sjacob Nov 23, 2015
fc00958
DDG-1148: Changed the Flint tool to remove a single threaded bottleneck
sjacob Jan 25, 2017
6156522
Merge pull request #1 from nla/ddg-1148
shuangzhou Jan 25, 2017
2120f26
Merge remote-tracking branch 'origin/master' into mobi-drm-check
sjacob Jan 25, 2017
1d93811
Added distribution management info.
sjacob Jan 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flint-core/src/main/java/uk/bl/dpt/qa/flint/Flint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import java.util.Map;
import java.util.Set;

import static uk.bl.dpt.qa.flint.wrappers.TikaWrapper.getMimetype;
import uk.bl.dpt.qa.flint.wrappers.TikaWrapper;
import static uk.bl.dpt.utils.util.FileUtil.traverse;

/**
Expand Down Expand Up @@ -168,7 +168,7 @@ public List<CheckResult> check(File pFile) {

boolean checked = false;

String mimetype = getMimetype(pFile);
String mimetype = new TikaWrapper().getMimetype(pFile);

List<CheckResult> results = new ArrayList<CheckResult>();

Expand Down
4 changes: 1 addition & 3 deletions flint-core/src/main/java/uk/bl/dpt/qa/flint/checks/TimedValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ public class TimedValidation {

private static Logger LOGGER = LoggerFactory.getLogger(TimedValidation.class);

protected static ExecutorService executor;

private TimedValidation(){}

/**
Expand All @@ -49,7 +47,7 @@ private TimedValidation(){}
* @return output from the TimedTask
*/
public static LinkedHashMap<String, CheckCategory> validate(TimedTask task, File contentFile) {
executor = Executors.newSingleThreadExecutor();
ExecutorService executor = Executors.newSingleThreadExecutor();
task.setContentFile(contentFile);
LinkedHashMap<String, CheckCategory> cMap = new LinkedHashMap<String, CheckCategory>();
Future<LinkedHashMap<String, CheckCategory>> future = executor.submit(task);
Expand Down
2 changes: 1 addition & 1 deletion flint-epub/src/main/java/uk/bl/dpt/qa/flint/epub/checks/PolicyValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public PolicyValidation(long timeout, Set<String> patternFilter) {
@Override
public LinkedHashMap<String, CheckCategory> call() throws Exception {
logger.info("Performing a policy validation on {}", contentFile);
StreamSource outputXml = EpubCheckWrapper.check(contentFile);
StreamSource outputXml = new EpubCheckWrapper().check(contentFile);
return PolicyAware.policyValidationResult(outputXml,
new StreamSource(EPUBFormat.getPolicyStatically()), patternFilter);
}
Expand Down
5 changes: 3 additions & 2 deletions flint-epub/src/main/java/uk/bl/dpt/qa/flint/epub/checks/Wellformedness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ public LinkedHashMap<String, CheckCategory> call() throws Exception {
LinkedHashMap<String, CheckCategory> cmap = new LinkedHashMap<String, CheckCategory>();
if (patternFilter == null || patternFilter.contains(catName) ) {
CheckCategory cc = new CheckCategory(catName);
if (CalibreWrapper.calibreIsAvailable()) {
CalibreWrapper calibreWrapper = new CalibreWrapper();
if (calibreWrapper.calibreIsAvailable()) {
try {
cc.add(new CheckCheck("isValidCalibre", CalibreWrapper.isValid(contentFile), null));
cc.add(new CheckCheck("isValidCalibre", calibreWrapper.isValid(contentFile), null));
logger.debug(cc.get("isValidCalibre").toString());
} catch (Exception e) {
logger.error(e.getMessage());
Expand Down
4 changes: 2 additions & 2 deletions flint-fx/flint-fx-direct/src/main/java/uk/bl/dpt/qa/flint/Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.Map;
import java.util.Set;

import static uk.bl.dpt.qa.flint.wrappers.TikaWrapper.getMimetype;
import uk.bl.dpt.qa.flint.wrappers.TikaWrapper;

/**
* A controller for the flint-fx GUI that directly runs the flint classes.
Expand Down Expand Up @@ -86,7 +86,7 @@ public void askForValidation() {
protected Collection<String> getAvailableFormats() {
Collection<String> formats = null;
try {
formats = Flint.getAvailableFormats(getMimetype(inputFile)).keySet();
formats = Flint.getAvailableFormats(new TikaWrapper().getMimetype(inputFile)).keySet();
} catch (IllegalAccessException | InstantiationException e) {
logger.error(e.getMessage());
popupError(e);
Expand Down
28 changes: 28 additions & 0 deletions flint-mobi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>flint</artifactId>
<groupId>uk.bl.dpt.qa</groupId>
<version>0.9.0-SNAPSHOT</version>
</parent>

<artifactId>flint-mobi</artifactId>

<dependencies>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>flint-core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

</dependencies>

</project>
Loading