+ funcionandoTodo

alxgarci · Jun 5, 2022 · de6907b · de6907b
1 parent 8d02759
commit de6907b
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,6 +7,7 @@
   <groupId>org.example</groupId>
   <artifactId>ProyInformaticaBETA</artifactId>
   <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
 
   <name>ProyInformaticaBETA</name>
   <!-- FIXME change it to the project's website -->
@@ -23,7 +24,6 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.11</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <!-- jsoup HTML parser library @ https://jsoup.org/ -->
@@ -32,15 +32,10 @@
       <version>1.14.3</version>
     </dependency>
     <dependency>
-      <groupId>io.github.shashankn</groupId>
-      <artifactId>qr-terminal</artifactId>
-      <version>1.0.0</version>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>core</artifactId>
+      <version>3.3.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>3.5.0.201409260305-r</version>
-  </dependency>
   </dependencies>
 
   <build>
@@ -65,13 +60,41 @@
           <version>2.22.1</version>
         </plugin>
         <!-- Plugin para compilar como jar, View->Tool Windows->Maven->package->Run MavenBuild -->
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
+          <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.example.mainMenu</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+          </configuration>
+          <executions>
+            <execution>
+                <id>make-assembly</id>
+                <phase>package</phase>
+                <goals>
+                    <goal>single</goal>
+                </goals>
+            </execution>
+        </executions>
+
+        </plugin>
+
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.2.0</version>
           <configuration>
             <finalName>ProyInformaticaBETA</finalName>
             <archive>
               <manifest>
+                  <addClasspath>true</addClasspath>
                   <mainClass>org.example.mainMenu</mainClass>
               </manifest>
             </archive>
@@ -94,6 +117,7 @@
           <artifactId>maven-project-info-reports-plugin</artifactId>
           <version>3.0.0</version>
         </plugin>
+
       </plugins>
     </pluginManagement>
   </build>

diff --git a/src/main/java/org/example/interfaces/Admin.java b/src/main/java/org/example/interfaces/Admin.java
@@ -25,6 +25,7 @@ public static void buscarPromociones() {
         for (Promo p : promos) {
             System.out.println(" " + p.toStringAdmin());
         }
+        enterContinuar();
 
     }
     public static void altaPromociones() {
@@ -66,10 +67,14 @@ public static void consultarLog() {
         } catch (IOException e) {
             e.printStackTrace();
         }
+       enterContinuar();
+
+    }
+
+    public static void enterContinuar(){
         System.out.println("[SYSTEM] Pulsa ENTER para continuar");
         Scanner sc = new Scanner(System.in);
         sc.nextLine();
-
     }
 
     private static void promoDBWrite(File dbCsv, Promo promo) {

diff --git a/src/main/java/org/example/interfaces/User.java b/src/main/java/org/example/interfaces/User.java
@@ -1,12 +1,12 @@
 package org.example.interfaces;
 
 import com.google.zxing.WriterException;
-import io.github.shashankn.qrterminal.QRCode;
 import org.example.App;
 import org.example.mainMenu;
 import org.example.obj.ItemListaCompra;
 import org.example.obj.Product;
 import org.example.obj.Promo;
+import org.example.tools.QRPrinter;
 import org.example.tools.WriteToLog;
 
 import java.io.BufferedReader;
@@ -32,6 +32,7 @@ public static void buscarPromociones() {
                 System.out.println(" [SYS] Codigo de promocion: " + p.getPromoCode());
             }
         }
+        Admin.enterContinuar();
 
     }
 
@@ -67,18 +68,12 @@ public static void verListaDeLaCompra() {
         } else {
             System.out.println("[ERROR] Sin elementos en la lista de la compra");
         }
-
+    Admin.enterContinuar();
 
     }
 
     private static void qrPrinter(String code) {
-        try {
-            System.out.println(QRCode.from(code).generate());
-            System.out.println(code);
-        } catch (WriterException e) {
-            e.printStackTrace();
-            WriteToLog.writeLogFile("[ERROR] Creando QR con codigo " + code);
-        }
+        System.out.println(QRPrinter.getQr(code));
     }
 
     public static ArrayList<Promo> getPromosMatching(File dbPromos, String promo) {
@@ -100,10 +95,6 @@ public static ArrayList<Promo> getPromosMatching(File dbPromos, String promo) {
         for (String string : set) {
 			if (string.contains(promo)) {
 				aux = Arrays.asList(string.split(Admin.PROMO_DATABASE_SEPARATOR));
-				for (String a :
-					 aux) {
-					System.out.println(a);
-				}
 				promosArray.add(new Promo(aux.get(0), aux.get(1), aux.get(2), aux.get(3), aux.get(4)));
 			}
         }

diff --git a/src/main/java/org/example/tools/QRPrinter.java b/src/main/java/org/example/tools/QRPrinter.java
@@ -0,0 +1,56 @@
+package org.example.tools;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import java.util.Hashtable;
+
+public class QRPrinter {
+
+    public static String getQr(String text) {
+        String s = "Cant generate QR";
+        int width = 40;
+        int height = 40;
+        Hashtable<EncodeHintType, Object> qrParam = new Hashtable<EncodeHintType, Object>();
+
+        qrParam.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L);
+        qrParam.put(EncodeHintType.CHARACTER_SET, "utf-8");
+        BitMatrix bitMatrix = null;
+        try {
+            bitMatrix = new MultiFormatWriter().encode(text, BarcodeFormat.QR_CODE, width, height, qrParam);
+        } catch (WriterException e) {
+            e.printStackTrace();
+        }
+        s = toAscii(bitMatrix);
+
+        return s;
+    }
+
+    public static String toAscii(BitMatrix bitMatrix) {
+        StringBuilder sb = new StringBuilder();
+        for (int rows = 0; rows < bitMatrix.getHeight(); rows++) {
+            for (int cols = 0; cols < bitMatrix.getWidth(); cols++) {
+                boolean x = bitMatrix.get(rows, cols);
+                if (!x) {
+                    // white
+                    sb.append("\033[47m  \033[0m");
+                } else {
+                    sb.append("\033[40m  \033[0m");
+                }
+            }
+            sb.append("\n");
+        }
+        return sb.toString();
+    }
+
+    public static void main(String[] args) throws Exception {
+        String text = "https://github.com/zhangshanhai/java-qrcode-terminal ";
+
+        System.out.println(getQr(text));
+    }
+
+}
diff --git a/target/test-classes/org/example/AppTest.class b/target/test-classes/org/example/AppTest.class