Add support for Powerpoint, Word doc, PDF, Outlook email, ZIP, GZ, BZ2 #25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove redundant configuration class
ebyhr
requested changes
Jun 7, 2020
Comment on lines
+96
to
+313
| lst.add("bcc_list " + bcc_list); | ||
| lst.add("subject " + subject); | ||
| lst.add("body " + body); | ||
| lines = lst.iterator(); | ||
| totalBytes = input.getCount(); | ||
|
|
||
| try (CountingInputStream input = new CountingInputStream(byteSource.openStream())) { | ||
| lines = plugin.getIterator(byteSource); | ||
| if (plugin.skipFirstLine()) { | ||
| lines.next(); | ||
| } catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } | ||
| totalBytes = input.getCount(); | ||
| } | ||
| catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| //zip | ||
| else if (tblName.endsWith(".zip") || tblName.contains(".zip?")) { | ||
| ArrayList<String> lst = new ArrayList<>(); | ||
| BufferedReader bufferedeReader = null; | ||
| try (CountingInputStream input = new CountingInputStream(byteSource.openStream()); | ||
| ZipInputStream zin = new ZipInputStream(input); | ||
| InputStreamReader isr = new InputStreamReader(zin)) { | ||
|
|
||
| ZipEntry entry; | ||
| bufferedeReader = new BufferedReader(isr); | ||
| while ((entry = zin.getNextEntry()) != null) { | ||
| String line = bufferedeReader.readLine(); | ||
| while (line != null) { | ||
| lst.add(line); | ||
| line = bufferedeReader.readLine(); | ||
| } | ||
| } | ||
| lines = lst.iterator(); | ||
| totalBytes = input.getCount(); | ||
| } catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e.getMessage()); | ||
| } finally { | ||
| try { if (bufferedeReader != null) | ||
| bufferedeReader.close(); | ||
| } catch (Exception e) { /* ignored */ } | ||
| } | ||
| } | ||
| //gz | ||
| else if (tblName.endsWith(".gz") || tblName.endsWith(".gzip") || tblName.contains(".gz?") || tblName.contains(".gzip?")) { | ||
| //getting unreadable compressed data back right now! | ||
| //todo need to fix with https://stackoverflow.com/a/11093226/8874837 https://www.rgagnon.com/javadetails/java-HttpUrlConnection-with-GZIP-encoding.html | ||
| ArrayList<String> lst = new ArrayList<>(); | ||
| BufferedReader in = null; | ||
| try (CountingInputStream input = new CountingInputStream(byteSource.openStream())) { | ||
| in = new BufferedReader(new InputStreamReader(new GZIPInputStream(input))); | ||
| String inputLine; | ||
| while ((inputLine = in.readLine()) != null){ | ||
| lst.add(inputLine); | ||
| } | ||
| lines = lst.iterator(); | ||
| totalBytes = input.getCount(); | ||
| } catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } finally { | ||
| try { if (in != null) | ||
| in.close(); | ||
| } catch (Exception e) { /* ignored */ } | ||
| } | ||
| } | ||
| //bz2 | ||
| else if (tblName.endsWith(".bz2") || tblName.endsWith(".bzip2") || tblName.contains(".bz2?") || tblName.contains(".bzip2?")) { | ||
| ArrayList<String> lst = new ArrayList<>(); | ||
| BufferedReader in = null; | ||
| try (CountingInputStream input = new CountingInputStream(byteSource.openStream())) { | ||
| in = new BufferedReader(new InputStreamReader(new MultiStreamBZip2InputStream(input))); | ||
| String inputLine; | ||
| while ((inputLine = in.readLine()) != null){ | ||
| lst.add(inputLine); | ||
| } | ||
| lines = lst.iterator(); | ||
| totalBytes = input.getCount(); | ||
| } catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } finally { | ||
| try { if (in != null) | ||
| in.close(); | ||
| } catch (Exception e) { /* ignored */ } | ||
| } | ||
| } | ||
| else { | ||
| //text/csv..etc | ||
| try (CountingInputStream input = new CountingInputStream(byteSource.openStream())) { | ||
| lines = plugin.getIterator(byteSource); | ||
| if (plugin.skipFirstLine()) { | ||
| lines.next(); | ||
| } | ||
| totalBytes = input.getCount(); | ||
| } | ||
| catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } |
There was a problem hiding this comment.
Please refer to the existing implementation. I wouldn't add file specific logic here.
|
found some bugs in the readers |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #16