Skip to content

Replaced Firefox login by chrome login to fix permission denied bug #11

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced Firefox login by chrome login to fix permission denied bug #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ hs_err_pid*
/.cjs-round

/javadoc.xml

# intellij files
*.iml
.idea
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<artifactId>selenium-firefox-driver</artifactId>
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
67 changes: 30 additions & 37 deletions src/main/java/fr/faylixe/googlecodejam/cli/ApplicationCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,5 @@
package fr.faylixe.googlecodejam.cli;

import io.github.bonigarcia.wdm.FirefoxDriverManager;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.GeneralSecurityException;
import java.util.List;
import java.util.Optional;
import java.util.Scanner;
import java.util.function.Supplier;

import static java.lang.System.out;
import static java.lang.System.err;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.lang3.SerializationUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.remote.UnreachableBrowserException;

import fr.faylixe.googlecodejam.cli.SeleniumCookieSupplier;
import fr.faylixe.googlecodejam.client.CodeJamSession;
import fr.faylixe.googlecodejam.client.Contest;
import fr.faylixe.googlecodejam.client.Round;
Expand All @@ -40,7 +10,30 @@
import fr.faylixe.googlecodejam.client.webservice.Problem;
import fr.faylixe.googlecodejam.client.webservice.ProblemInput;
import fr.faylixe.googlecodejam.client.webservice.SubmitResponse;
import io.github.bonigarcia.wdm.ChromeDriverManager;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.lang3.SerializationUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.remote.UnreachableBrowserException;

import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.GeneralSecurityException;
import java.util.List;
import java.util.Optional;
import java.util.Scanner;
import java.util.function.Supplier;

import static fr.faylixe.googlecodejam.cli.ApplicationConstant.*;
import static java.lang.System.err;
import static java.lang.System.out;

/**
* <p>This class contains static method that are
Expand Down Expand Up @@ -199,7 +192,7 @@ private static void extractDataset(final Problem problem, final int id) throws I
}

/**
* Starts firefox through selenium to retrieve
* Starts chrome through selenium to retrieve
* cookie instance and process initialization.
*
* @param driverSupplier Driver supplier to use.
Expand All @@ -208,8 +201,8 @@ private static void extractDataset(final Problem problem, final int id) throws I
*/
private static CommandStatus browserInit(final Supplier<WebDriver> driverSupplier, final String contest) {
out.println("[Initialization] Web browser will open, please authenticate to your Google account with it.");
FirefoxDriverManager.getInstance().setup();
final SeleniumCookieSupplier supplier = new SeleniumCookieSupplier(Request.getHostname() + "/codejam", FirefoxDriver::new);
ChromeDriverManager.getInstance().setup();
final SeleniumCookieSupplier supplier = new SeleniumCookieSupplier(Request.getHostname() + "/codejam", ChromeDriver::new);
try {
final String cookie = supplier.get();
if (cookie == null) {
Expand Down Expand Up @@ -261,16 +254,16 @@ public static CommandStatus init(final CommandLine command) {
final String contest = command.getOptionValue(CONTEST);
if (command.hasOption(INIT_METHOD)) {
final String method = command.getOptionValue(INIT_METHOD).toLowerCase();
if (FIREFOX_METHOD.equals(method)) {
return browserInit(FirefoxDriver::new, contest);
if (CHROME_METHOD.equals(method)) {
return browserInit(ChromeDriver::new, contest);
}
else if (TEXT_METHOD.equals(method)) {
return textInit(contest);
}
err.println("-> Invalid method provided (only firefox or text supported");
err.println("-> Invalid method provided (only chrome or text supported");
return CommandStatus.INVALID_FORMAT;
}
return browserInit(FirefoxDriver::new, contest);
return browserInit(ChromeDriver::new, contest);
}

/**
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/fr/faylixe/googlecodejam/cli/ApplicationConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ public final class ApplicationConstant {
/** Parameter value for firefox initialization method. **/
public static final String FIREFOX_METHOD = "firefox";

/** Parameter value for chrome initialization method. **/
public static final String CHROME_METHOD = "chrome";

/** Parameter value for text initialization method. **/
public static final String TEXT_METHOD = "text";

Expand Down