Thastertyn/jecnak-tui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

omyl s jar souborem, par vylepseni, java 11

Browse Source
This commit is contained in:
Thastertyn 2023-04-05 14:28:50 +02:00
parent 43b2701151
commit 5e5e6f26da
15 changed files with 106 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1 +1,2 @@
*.class
*.class
jecnak-tui.jar

2
.vscode/settings.json vendored
View File

@ -1,3 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
"java.configuration.updateBuildConfiguration": "automatic"
}

BIN
jecnak-tui.jar
View File

Binary file not shown.

12
pom.xml
View File

@ -14,8 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
@ -26,14 +26,6 @@
<version>1.15.3</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.lanterna</groupId>
<artifactId>lanterna</artifactId>

3
src/main/java/xyz/thastertyn/App.java
View File

@ -13,7 +13,6 @@ public class App {
MainWindow window = new MainWindow();
window.run();
/*
try {
@ -32,7 +31,7 @@ public class App {
//#endregion
} catch (IOException e) {
// TODO Auto-generated catch block
// TO DO Auto-generated catch block
e.printStackTrace();
} catch (SecurityException e)
{

5
src/main/java/xyz/thastertyn/ContentDisplay/Content/OmluvnyList.java
View File

@ -29,12 +29,13 @@ public class OmluvnyList extends JecnaContent{
{
omluvnyPanel.addComponent(new Label(p.getValue0() + " - " + p.getValue1()));
}
hasStarted = true;
}catch(UnknownHostException e)
{
omluvnyPanel.addComponent(new Label("A connection error occurred"));
// omluvnyPanel.addComponent(new Label("A connection error occurred"));
}catch(IOException e)
{
omluvnyPanel.addComponent(new Label("An error occurred"));
// omluvnyPanel.addComponent(new Label("An error occurred"));
}
}

20
src/main/java/xyz/thastertyn/ContentDisplay/Content/Sdeleni.java
View File

@ -10,8 +10,6 @@ import com.googlecode.lanterna.gui2.Label;
import com.googlecode.lanterna.gui2.Panel;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import xyz.thastertyn.Tuples.Pair;
public class Sdeleni extends JecnaContent {
private Panel sdeleniPanel = new Panel();
@ -28,29 +26,17 @@ public class Sdeleni extends JecnaContent {
if(!hasStarted)
{
try{
sdeleniPanel.setLayoutManager(new GridLayout(1)
.setLeftMarginSize(1)
.setRightMarginSize(1));
sdeleni.downloadSdeleni();
ArrayList<Pair<String, Boolean>> sdeleniList = sdeleni.getSdeleni();
ArrayList<String> sdeleniList = sdeleni.getSdeleni();
for(Pair<String, Boolean> p : sdeleniList)
for(String s : sdeleniList)
{
String label = "";
if(p.getValue1())
{
label += "✅";
}else{
label += "❌";
}
label += " " + p.getValue0();
sdeleniPanel.addComponent(new Label(label));
sdeleniPanel.addComponent(new Label(s));
}
hasStarted = true;
}catch(UnknownHostException e)

14
src/main/java/xyz/thastertyn/ContentDisplay/LoginController.java
View File

@ -18,10 +18,9 @@ import xyz.thastertyn.Tuples.Triplet;
public class LoginController {
private WindowBasedTextGUI textGUI;
private xyz.thastertyn.ContentDisplay.CredentialsInput dialog;
private xyz.thastertyn.JecnaParse.Login login = new xyz.thastertyn.JecnaParse.Login();
private xyz.thastertyn.ContentDisplay.CredentialsInput dialog = new CredentialsInput();
private WindowBasedTextGUI textGUI = null;
public LoginController(WindowBasedTextGUI textGUI)
{
@ -30,6 +29,7 @@ public class LoginController {
public void login()
{
dialog = new CredentialsInput();
if(checkForCredentials()) // Credentials exist
{
if(loginUsingCredentials()) // They are accessible and can read them
@ -38,27 +38,27 @@ public class LoginController {
}
}
Triplet<String, String, Boolean> data = dialog.showDialog(textGUI); // Failed to get credentials to log in, get them from user
try
{
Triplet<String, String, Boolean> data = dialog.showDialog(textGUI); // Failed to get credentials to log in, get them from user
login.loginJecna(data.getValue0(), data.getValue1());
} catch (UnknownHostException e) {
MessageDialog.showMessageDialog(textGUI, "No Internet connection",
"There seems to be no internet connection, reverting to cached data",
MessageDialogButton.OK);
return;
login();
} catch (CredentialException e)
{
MessageDialog.showMessageDialog(textGUI, "Incorrect username or password",
"The username or password you entered is incorrect",
MessageDialogButton.OK);
return;
login();
} catch (IOException e)
{
MessageDialog.showMessageDialog(textGUI, "There was an error",
"Maybe try again and it will go away",
MessageDialogButton.Retry);
return;
login();
}
}

2
src/main/java/xyz/thastertyn/ContentDisplay/MainWindow.java
View File

@ -58,7 +58,7 @@ public class MainWindow {
LoginController controller = new LoginController(textGUI);
controller.login();
window.addWindowListener(new WindowSwitchListener(content, title));
window.addWindowListener(new WindowSwitchListener(content, title, textGUI));
textGUI.addWindowAndWait(window);

37
src/main/java/xyz/thastertyn/ContentDisplay/WindowSwitchListener.java
View File

@ -10,7 +10,10 @@ import com.googlecode.lanterna.gui2.Label;
import com.googlecode.lanterna.gui2.LinearLayout;
import com.googlecode.lanterna.gui2.Panel;
import com.googlecode.lanterna.gui2.Window;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import com.googlecode.lanterna.gui2.WindowListener;
import com.googlecode.lanterna.gui2.dialogs.MessageDialog;
import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton;
import com.googlecode.lanterna.input.KeyStroke;
import com.googlecode.lanterna.input.KeyType;
@ -22,20 +25,29 @@ import xyz.thastertyn.ContentDisplay.Content.Znamky;
public class WindowSwitchListener implements WindowListener {
private JecnaContent[] contents = {new Rozvrh(), new Znamky(), new Sdeleni(), new OmluvnyList()};
private WindowBasedTextGUI textGUI;
private JecnaContent[] contents = {
new Rozvrh(),
new Znamky(),
new Sdeleni(),
new OmluvnyList()
};
private Label[] tabs = new Label[contents.length];
private Panel tabsPanel = new Panel().setLayoutManager(new LinearLayout(Direction.HORIZONTAL));
private Panel content = new Panel();
private Panel holderPanel = new Panel();
private Panel errorPanel = new Panel().addComponent(new Label("Something went wrong"));
int current = contents.length - 1;
public WindowSwitchListener(Panel holder, String title)
public WindowSwitchListener(Panel holder, String title, WindowBasedTextGUI textGUI)
{
this.textGUI = textGUI;
holder.addComponent(tabsPanel);
holder.addComponent(content.withBorder(Borders.singleLine()));
holder.addComponent(holderPanel.withBorder(Borders.singleLine()));
for(int i = 0; i < contents.length; i++)
{
@ -60,7 +72,7 @@ public class WindowSwitchListener implements WindowListener {
contents[current].download();
}
content.removeAllComponents();
holderPanel.removeAllComponents();
tabsPanel.removeAllComponents();
if(contents[current].hasStarted())
@ -69,15 +81,15 @@ public class WindowSwitchListener implements WindowListener {
if(contents[current].getPanel().getSize().getColumns() < tabColumns)
{
content.addComponent(
holderPanel.addComponent(
contents[current].getPanel().setPreferredSize(new TerminalSize(tabColumns,
contents[current].getPanel().getPreferredSize().getRows())));
}else{
content.addComponent(contents[current].getPanel());
holderPanel.addComponent(contents[current].getPanel());
}
}else{
content.addComponent(errorPanel);
holderPanel.addComponent(errorPanel);
}
for(int i = 0; i < tabs.length; i++)
@ -100,6 +112,15 @@ public class WindowSwitchListener implements WindowListener {
case Tab:
next();
break;
case Character:
if(keyStroke.getCharacter() == ' ')
{
MessageDialog.showMessageDialog(textGUI, "Space pressed", "Good job", MessageDialogButton.OK);
}
break;
case Escape:
MessageDialog.showMessageDialog(textGUI, "Options", "Loging out and some other stuff soon", MessageDialogButton.OK);
break;
default:
break;
}

5
src/main/java/xyz/thastertyn/JecnaParse/JecnaParser.java Normal file
View File

@ -0,0 +1,5 @@
package xyz.thastertyn.JecnaParse;
public class JecnaParser {
}

10
src/main/java/xyz/thastertyn/JecnaParse/OmluvnyList.java
View File

@ -14,8 +14,6 @@ public class OmluvnyList {
private ArrayList<Pair<String, String>> data = new ArrayList<>();
private boolean wasDownloaded = false;
public void downloadOmluvnyList() throws UnknownHostException, IOException
{
Document doc = Downloader.download("https://www.spsejecna.cz/absence/student").get();
@ -29,12 +27,16 @@ public class OmluvnyList {
data.add(new Pair<String, String>(date, text));
}
wasDownloaded = true;
}
public ArrayList<Pair<String, String>> getData()
{
return data;
}
@Override
public String toString()
{
return (!data.isEmpty()) ? data.toString() : null;
}
}

20
src/main/java/xyz/thastertyn/JecnaParse/Sdeleni.java
View File

@ -8,11 +8,9 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import xyz.thastertyn.Tuples.Pair;
public class Sdeleni {
ArrayList<Pair<String, Boolean>> sdeleniList = new ArrayList<>();
ArrayList<String> sdeleniList = new ArrayList<>();
public void downloadSdeleni() throws UnknownHostException, IOException
{
@ -29,19 +27,19 @@ public class Sdeleni {
isPositive = spans.get(0).hasClass("sprite-icon-tick-16");
label = spans.get(1).text();
//if(!label.startsWith(" "))
//{
// label = " " + label;
//}
//label = label.replaceAll("\\s+$", "");
if(isPositive)
{
label = "✅" + " " + label;
}else{
label = "❌" + " " + label;
}
sdeleniList.add(new Pair<String, Boolean>(label, isPositive));
sdeleniList.add(label);
}
}
public ArrayList<Pair<String, Boolean>> getSdeleni()
public ArrayList<String> getSdeleni()
{
return sdeleniList;
}

37
src/main/java/xyz/thastertyn/JecnaParse/Znamky.java
View File

@ -19,7 +19,7 @@ public class Znamky {
private ArrayList<Pair<String, Pair<ArrayList<Pair<Integer, Double>>,Double>>> grades = new ArrayList<>();
// Integer znaci id roku, boolean jestli je jen prvni nebo i druhe pololeti
private ArrayList<Pair<Integer, Boolean>> options = new ArrayList<>();
private Pair<ArrayList<String>, ArrayList<String>> options = new Pair<>();
public void downloadZnamky(/*, int schoolYearId, int schoolYearHalfId*/) throws UnknownHostException, IOException
{
@ -75,24 +75,28 @@ public class Znamky {
subj++;
}
Element optionsPanel = znamkyDoc.selectFirst("form.listConfigure");
/*
Elements roky = znamkyDoc.select("select[name=schoolYearId]");
Elements pololetiSelect = znamkyDoc.select("select[name=schoolYearHalfId]");
Elements schoolYear = optionsPanel.select("select[id=schoolYearId]").select("option");
Elements schoolYearId = optionsPanel.select("select[id=schoolYearHalfId]").select("option");
for(Element e : roky)
{
boolean jeCelyRok = false;
if(pololetiSelect.size() == 2)
/*
Elements roky = znamkyDoc.select("select[name=schoolYearId]");
Elements pololetiSelect = znamkyDoc.select("select[name=schoolYearHalfId]");
for(Element e : roky)
{
jeCelyRok = true;
}
boolean jeCelyRok = false;
if(pololetiSelect.size() == 2)
{
jeCelyRok = true;
}
int rok = Integer.parseInt(e.attr("value"));
int rok = Integer.parseInt(e.attr("value"));
options.add(new Pair<Integer, Boolean>(rok, jeCelyRok));
}*/
options.add(new Pair<Integer, Boolean>(rok, jeCelyRok));
}*/
wasDownloaded = true;
@ -143,11 +147,6 @@ public class Znamky {
return grades;
}
public ArrayList<Pair<Integer, Boolean>> getOptions()
{
return options;
}
@Override
public String toString()
{

19
src/test/java/xyz/thastertyn/AppTest.java
View File

@ -17,4 +17,23 @@ public class AppTest
{
assertTrue( true );
}
@Test
public void hasJavaAbove11()
{
// https://stackoverflow.com/questions/2591083/getting-java-version-at-runtime#2591122
String version = System.getProperty("java.version");
int v;
if(version.startsWith("1."))
{
version = version.substring(2, 3);
}else {
int dot = version.indexOf(".");
if(dot != -1) { version = version.substring(0, dot); }
}
v = Integer.parseInt(version);
assertTrue("Java >= 11 is required", (v >= 11));
}
}