Skip to content

Fixed #6 hang on compression? #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JanDornbusch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed #6 hang on compression? #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
.cpcache/
.lsp/
.clj-kondo/
.calva/
9 changes: 5 additions & 4 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
(defproject net.cgrand/spreadmap "0.1.4"
(defproject net.cgrand/spreadmap "0.1.5"
:description "Evil project to turn excel spreadsheets in persistent reactive structures."
; :url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:java-source-paths ["java-src"]
:dependencies [[org.clojure/clojure "1.5.1"]
[org.apache.poi/poi "3.9"]
[org.apache.poi/poi-ooxml "3.9"]])
:dependencies [[org.clojure/clojure "1.7.0"]
[org.apache.poi/poi "5.2.3"]
[org.apache.poi/poi-ooxml "5.2.3"]
[org.apache.commons/commons-compress "1.22"]])
78 changes: 39 additions & 39 deletions src/net/cgrand/spreadmap.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
(ns net.cgrand.spreadmap
(:require [clojure.java.io :as io])
(:import [org.apache.poi.ss.usermodel Workbook WorkbookFactory CellValue DateUtil Cell]
[org.apache.poi.ss.formula.eval ValueEval StringEval BoolEval NumberEval BlankEval ErrorEval]
[org.apache.poi.ss.formula IStabilityClassifier EvaluationWorkbook EvaluationSheet EvaluationName EvaluationCell FormulaParser FormulaType]
[org.apache.poi.ss.util CellReference AreaReference]))
(:import [org.apache.poi.ss.usermodel Workbook WorkbookFactory DateUtil CellType] ;; unused: CellValue
[org.apache.poi.ss.formula.eval StringEval BoolEval NumberEval BlankEval] ;; unused ValueEval ErrorEval
[org.apache.poi.ss.formula IStabilityClassifier EvaluationWorkbook EvaluationSheet EvaluationCell FormulaParser FormulaType] ;; EvaluationName
[org.apache.poi.ss.util CellReference AreaReference]))

(defprotocol Valueable
(value [v wb cref]))

(defn- canon
"Converts to a canonical cell ref [\"sheet\" row col]"
[ref ^Workbook wb]
(cond
(string? ref)
(cond
(string? ref)
(recur
(if-let [name (.getName wb ref)]
(-> name .getRefersToFormula AreaReference. .getFirstCell)
(CellReference. ^String ref))
wb)
(if-let [name (.getName wb ref)]
(-> name .getRefersToFormula (AreaReference. (.getSpreadsheetVersion wb)) .getFirstCell)
(CellReference. ^String ref))
wb)
(instance? CellReference ref)
(let [^CellReference cref ref]
[(or (.getSheetName cref) (-> wb (.getSheetAt 0) .getSheetName))
(.getRow cref) (.getCol cref)])
(= 3 (count ref))
(let [[sheet row col] ref
sheet (if (number? sheet) (-> wb (.getSheetAt sheet) .getSheetName) sheet)]
sheet (if (number? sheet) (-> wb (.getSheetAt sheet) .getSheetName) sheet)]
[sheet row col])
(string? (second ref))
(let [[sheet ^String ref] ref
cref (CellReference. ref)
sheet (if (number? sheet) (-> wb (.getSheetAt sheet) .getSheetName) sheet)]
sheet (if (number? sheet) (-> wb (.getSheetAt sheet) .getSheetName) sheet)]
[sheet (.getRow cref) (.getCol cref)])
:else
(let [[row col] ref
sheet (-> wb (.getSheetAt 0) .getSheetName)]
sheet (-> wb (.getSheetAt 0) .getSheetName)]
[sheet row col])))

(defprotocol CellMisc
Expand All @@ -53,23 +53,23 @@
(getSheet [this] sheet)
(getCellType [this]
(cond
(instance? Boolean v) Cell/CELL_TYPE_BOOLEAN
(number? v) Cell/CELL_TYPE_NUMERIC
(string? v) Cell/CELL_TYPE_STRING
(nil? v) Cell/CELL_TYPE_BLANK
(:formula v) Cell/CELL_TYPE_FORMULA))
(instance? Boolean v) CellType/BOOLEAN
(number? v) CellType/NUMERIC
(string? v) CellType/STRING
(nil? v) CellType/BLANK
(:formula v) CellType/FORMULA))
(getNumericCellValue [this] (double v))
(getIdentityKey [this] [idx row col])
(getRowIndex [this] row)
(getBooleanCellValue [this] v)
#_(getErrorCellValue [this] )
#_(getErrorCellValue [this])
(getStringCellValue [this] v)
(getColumnIndex [this] col)
#_(getCachedFormulaResultType [this] (.getCachedFormulaResultType cell))
CellMisc
(formula-tokens [cell wb]
(FormulaParser/parse (:formula v) wb FormulaType/CELL
idx))))
(FormulaParser/parse (:formula v) wb FormulaType/CELL
idx))))

(extend-protocol SheetMisc
EvaluationSheet
Expand All @@ -78,20 +78,20 @@

(defn- sheet [^EvaluationSheet sht idx cells]
(reify
org.apache.poi.ss.formula.EvaluationSheet
(getCell [this row col]
(if-let [kv (find cells [row col])]
(cell this idx row col (val kv))
(.getCell sht row col)))
SheetMisc
(sheet-index [this wb]
(sheet-index sht wb))))
org.apache.poi.ss.formula.EvaluationSheet
(getCell [this row col]
(if-let [kv (find cells [row col])]
(cell this idx row col (val kv))
(.getCell sht row col)))
SheetMisc
(sheet-index [this wb]
(sheet-index sht wb))))

(defn- ^EvaluationWorkbook workbook [^EvaluationWorkbook wb assocs]
(reify EvaluationWorkbook
(getName [this G__3335 G__3336] (.getName wb G__3335 G__3336))
(getName [this G__3337] (.getName wb G__3337))
(getSheet [this idx]
(getSheet [this idx]
(if-let [cells (some-> this (.getSheetName idx) assocs)]
(sheet (.getSheet wb idx) idx cells)
(.getSheet wb idx)))
Expand All @@ -107,25 +107,25 @@

(defn- getter [wb assocs]
(let [ewb (workbook
(cond
(cond
(instance? org.apache.poi.xssf.usermodel.XSSFWorkbook wb)
(org.apache.poi.xssf.usermodel.XSSFEvaluationWorkbook/create wb)
(instance? org.apache.poi.hssf.usermodel.HSSFWorkbook wb)
(org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook/create wb))
assocs)
assocs)
evaluator (org.apache.poi.ss.formula.WorkbookEvaluator.
ewb IStabilityClassifier/TOTALLY_IMMUTABLE nil)]
ewb IStabilityClassifier/TOTALLY_IMMUTABLE nil)]
(fn [[sname row col :as cref]]
(when-let [cell (some-> ewb (.getSheet (.getSheetIndex ewb ^String sname))
(.getCell row col))]
(.getCell row col))]
(value (.evaluate evaluator cell) wb cref)))))

(declare ss)

(deftype SpreadSheet [^Workbook wb assocs g]
clojure.lang.Associative
(assoc [this ref v]
(let [[sname row col] (canon ref wb)]
(let [[sname row col] (canon ref wb)]
(ss wb (assoc-in assocs [sname [row col]] v))))
(containsKey [this ref]
(boolean (.valAt this ref nil)))
Expand All @@ -135,8 +135,8 @@
clojure.lang.IPersistentCollection
(cons [this x]
(ss wb (into assocs
(for [[ref v] (conj {} x)]
[(canon ref wb) v]))))
(for [[ref v] (conj {} x)]
[(canon ref wb) v]))))
(equiv [this that]
; should be: same master and same assocs
(.equals this that))
Expand All @@ -150,7 +150,7 @@
(defn- ss [^Workbook wb assocs]
(SpreadSheet. wb assocs (delay (getter wb assocs))))

(defn spreadmap
(defn spreadmap
"Creates a spreadmap from an Excel file, accepts same arguments as io/input-stream."
[x & opts]
(let [wb (with-open [^java.io.InputStream in
Expand All @@ -169,7 +169,7 @@
(value [v ^Workbook wb [sname row col]]
(let [d (.getNumberValue v)]
(if (some-> wb (.getSheet sname) (.getRow row) (.getCell col)
DateUtil/isCellDateFormatted)
DateUtil/isCellDateFormatted)
(DateUtil/getJavaDate d)
d)))
BlankEval
Expand Down