Skip to content
This repository has been archived by the owner on Jan 7, 2025. It is now read-only.

Commit

Permalink
Switch from reload4j to more modern log4j2, which supports modules
Browse files Browse the repository at this point in the history 
Made for #9
  • Loading branch information
@eugeneandrienko
eugeneandrienko committed Jan 22, 2023
1 parent 89d1268 commit f627d07
Show file tree
Hide file tree
Showing 31 changed files with 558 additions and 316 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
app/target/
telegram/target/
youtubedl/target/

**/.classpath
**/.factorypath
**/.project
**/.settings/
184 changes: 88 additions & 96 deletions app/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,106 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<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>
<groupId>com.eugene_andrienko</groupId>
<artifactId>telepodcast</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>com.eugene_andrienko</groupId>
<artifactId>telepodcast</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<groupId>com.eugene_andrienko</groupId>
<artifactId>app</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<artifactId>app</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<telepodcast.version>1.0-SNAPSHOT</telepodcast.version>
</properties>
<properties>
<telepodcast.version>1.0-SNAPSHOT</telepodcast.version>
</properties>

<name>Telepodcast application</name>
<url>https://github.com/eugeneandrienko/telepodcast</url>
<name>Telepodcast application</name>
<url>https://github.com/eugeneandrienko/telepodcast</url>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.22</version>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.82</version>
</dependency>
<dependency>
<groupId>com.googlecode.lanterna</groupId>
<artifactId>lanterna</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
<artifactId>emoji-java</artifactId>
<version>5.1.1</version>
</dependency>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.82</version>
</dependency>
<dependency>
<groupId>com.googlecode.lanterna</groupId>
<artifactId>lanterna</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
<artifactId>emoji-java</artifactId>
<version>5.1.1</version>
</dependency>

<dependency>
<groupId>com.eugene_andrienko</groupId>
<artifactId>telegram</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.eugene_andrienko</groupId>
<artifactId>youtubedl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<dependency>
<groupId>com.eugene_andrienko</groupId>
<artifactId>telegram</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.eugene_andrienko</groupId>
<artifactId>youtubedl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<!-- TODO: rename JAR from app to telepodcast -->
<addClasspath>true</addClasspath>
<classpathPrefix>dependencies/</classpathPrefix>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<mainClass>com.eugene_andrienko.telepodcast.TelePodcast</mainClass>
<!-- TODO: -->
<!-- <manifestEntries> -->
<!-- <Implementation-Title>Telepodcast</Implementation-Title> -->
<!-- <Implementation-Version>${telepodcast.version}</Implementation-Version> -->
<!-- </manifestEntries> -->
</manifest>
</archive>
</configuration>
</plugin>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<!-- TODO: rename JAR from app to telepodcast -->
<addClasspath>true</addClasspath>
<classpathPrefix>dependencies/</classpathPrefix>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<mainClass>com.eugene_andrienko.telepodcast.TelePodcast</mainClass>
<!-- TODO: -->
<!-- <manifestEntries> -->
<!-- <Implementation-Title>Telepodcast</Implementation-Title> -->
<!-- <Implementation-Version>${telepodcast.version}</Implementation-Version> -->
<!-- </manifestEntries> -->
</manifest>
</archive>
</configuration>
</plugin>

<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.eugene_andrienko.telepodcast.TelePodcast</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.eugene_andrienko.telepodcast.TelePodcast
</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
25 changes: 12 additions & 13 deletions app/src/main/java/com/eugene_andrienko/telepodcast/TelePodcast.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@
import com.eugene_andrienko.telegram.api.exceptions.TelegramInitException;
import com.eugene_andrienko.telepodcast.cli.CLI;
import com.eugene_andrienko.telepodcast.gui.GUI;
import com.eugene_andrienko.telepodcast.logging.ConsoleConfigurationFactory;
import com.eugene_andrienko.telepodcast.logging.ConsoleDebugConfigurationFactory;
import com.eugene_andrienko.telepodcast.logging.DebugConfigurationFactory;
import com.eugene_andrienko.telepodcast.logging.NoneConfigurationFactory;
import com.eugene_andrienko.telepodcast.tui.TUI;
import com.eugene_andrienko.telepodcast.tui.TUIException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import lombok.Cleanup;
import org.apache.log4j.PropertyConfigurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;


/**
Expand Down Expand Up @@ -82,7 +86,7 @@ private void run(String[] args)
}

setupLogger();
log = LoggerFactory.getLogger(TelePodcast.class);
log = LogManager.getLogger(TelePodcast.class);

if(authorize)
{
Expand Down Expand Up @@ -157,26 +161,21 @@ private void showHelpMessageAndExit()
*/
private void setupLogger()
{
final String CONSOLE_PROPERTIES = "/log4j-console.properties";
final String CONSOLE_DEBUG_PROPERTIES = "/log4j-console-debug.properties";
final String DEBUG_PROPERTIES = "/log4j-debug.properties";
final String NOLOG_PROPERTIES = "/log4j-none.properties";

if((launchGui || launchTui) && debug)
{
PropertyConfigurator.configure(TelePodcast.class.getResource(DEBUG_PROPERTIES));
ConfigurationFactory.setConfigurationFactory(new DebugConfigurationFactory());
}
else if(launchGui || launchTui)
{
PropertyConfigurator.configure(TelePodcast.class.getResource(NOLOG_PROPERTIES));
ConfigurationFactory.setConfigurationFactory(new NoneConfigurationFactory());
}
else if(debug)
{
PropertyConfigurator.configure(TelePodcast.class.getResource(CONSOLE_DEBUG_PROPERTIES));
ConfigurationFactory.setConfigurationFactory(new ConsoleDebugConfigurationFactory());
}
else
{
PropertyConfigurator.configure(TelePodcast.class.getResource(CONSOLE_PROPERTIES));
ConfigurationFactory.setConfigurationFactory(new ConsoleConfigurationFactory());
}
}

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/eugene_andrienko/telepodcast/cli/CLI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;


/**
* CLI realization.
*/
@Slf4j
@Log4j2
public class CLI implements AutoCloseable
{
private TelegramApi telegram;
Expand Down Expand Up @@ -105,7 +105,8 @@ else if(contentType == ContentType.VIDEO)
while(downloadState != DownloadState.COMPLETE && downloadState != DownloadState.FAIL)
{
downloadState = youtube.getDownloadState(url);
log.debug("Downloading {}, progress: {}", url, youtube.getDownloadProgress(url));
log.debug("Downloading {}, progress: {}, state: {}",
url, youtube.getDownloadProgress(url), downloadState.toString());
try
{
Thread.sleep(100);
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/com/eugene_andrienko/telepodcast/gui/GUI.java
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package com.eugene_andrienko.telepodcast.gui;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.log4j.Log4j2;


@Log4j2
public class GUI
{
private final Logger logger = LoggerFactory.getLogger(GUI.class);

public GUI()
{
logger.error("Not implemented yet!");
log.error("Not implemented yet!");
throw new UnsupportedOperationException("Not implemented yet!");
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/eugene_andrienko/telepodcast/helpers/GarbageTextRemover.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;


/**
* Removes garbage text from YouTube video description.
*/
@Slf4j
@Log4j2
public class GarbageTextRemover
{
/**
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/eugene_andrienko/telepodcast/helpers/SimpleTextHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;


@Slf4j
@Log4j2
public class SimpleTextHelper
{
/**
Expand Down
Loading

0 comments on commit f627d07

Please sign in to comment.