diff --git a/jpacrepo.iml b/jpacrepo.iml
deleted file mode 100644
index 7b735f0..0000000
--- a/jpacrepo.iml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/org/jpacrepo/frontend/component/JPacRepoApp.java b/src/main/java/org/jpacrepo/frontend/component/JPacRepoApp.java
index 54ffd9f..6e0fb83 100644
--- a/src/main/java/org/jpacrepo/frontend/component/JPacRepoApp.java
+++ b/src/main/java/org/jpacrepo/frontend/component/JPacRepoApp.java
@@ -110,7 +110,7 @@ public class JPacRepoApp extends WApplication
previousItem.clicked().addListener(this, () ->
{
int newIndex = pageMenu.getCurrentIndex() - 1;
- if(newIndex>=0)
+ if (newIndex >= 0)
{
pageMenu.select(newIndex);
pageMenu.itemAt(newIndex).clicked().trigger(new WMouseEvent());
@@ -120,7 +120,7 @@ public class JPacRepoApp extends WApplication
nextItem.clicked().addListener(this, () ->
{
int newIndex = pageMenu.getCurrentIndex() + 1;
- if(newIndex
{
- if(!packageNameEdit.getDisplayText().equals(lastName))
+ if (!packageNameEdit.getDisplayText().equals(lastName))
{
lastName = packageNameEdit.getDisplayText();
Map predicateMap = new HashMap<>();
@@ -207,7 +207,7 @@ public class JPacRepoApp extends WApplication
.generateReplacerJS(contactOptions), parent);
popup.forEdit(linkedFormWidget, EnumSet.of(WSuggestionPopup.PopupTrigger.Editing, WSuggestionPopup.PopupTrigger.DropDownIcon));
List wstrings = new ArrayList<>();
- for(String suggestion :suggestions)
+ for (String suggestion : suggestions)
{
wstrings.add(new WString(suggestion));
// popup.addSuggestion(suggestion);
diff --git a/src/main/java/org/jpacrepo/pacbase/Parser.java b/src/main/java/org/jpacrepo/pacbase/Parser.java
index 2a43782..e59bdb9 100644
--- a/src/main/java/org/jpacrepo/pacbase/Parser.java
+++ b/src/main/java/org/jpacrepo/pacbase/Parser.java
@@ -36,30 +36,30 @@ public class Parser
if(ae.getName().equals(".PKGINFO"))
{
Map> propMap = new HashMap<>();
- byte[] buffer = new byte[tais.getRecordSize()];
+ byte[] buffer = new byte[(int)tais.getCurrentEntry().getSize()];
tais.read(buffer);
String info = new String(buffer, Charset.forName("UTF8"));
for(String line : info.split("\n"))
{
- if(line.startsWith("#"))
+ if(line.startsWith("#") || line.trim().length() == 0)
{
continue;
}
else
{
- String[] pair = line.split(" = ");
- if(pair.length > 2)
+ int equals = line.indexOf("=");
+ if(equals < 0)
{
throw new RuntimeException("Error parsing .PKGINFO file");
}
- else if(pair.length == 2)
+ else
{
- String key = pair[0].trim();
+ String key = line.substring(0, equals).trim();
if(propMap.get(key) == null)
{
propMap.put(key, new ArrayList<>());
}
- propMap.get(key).add(pair[1].trim());
+ propMap.get(key).add(line.substring(equals+1, line.length()).trim());
}
}
}
diff --git a/src/test/java/ParseTest.java b/src/test/java/ParseTest.java
index 56d63ee..2980204 100644
--- a/src/test/java/ParseTest.java
+++ b/src/test/java/ParseTest.java
@@ -36,7 +36,7 @@ public class ParseTest
@Test
public void parseTest() throws Exception
{
- String[] files = new String[]{"/var/cache/pacman/pkg/mesa-10.4.5-1-x86_64.pkg.tar.xz", "/var/cache/pacman/pkg/mesa-10.5.3-1-x86_64.pkg.tar.xz"};
+ String[] files = new String[]{"/home/walter/Scaricati/oh-my-zsh-git-3912.d310fac-1-any.pkg.tar.xz"};
for (String file : files)
{