Merge branch 'master' of git.mosad.xyz:localhorst/TextureSync
This commit is contained in:
commit
6feb1c3dad
|
@ -51,7 +51,7 @@ class RootController : Controller() {
|
||||||
val uuid = UUID.randomUUID()
|
val uuid = UUID.randomUUID()
|
||||||
val format = if (File(path).extension.toLowerCase() == "png") TextureFormat.PNG else TextureFormat.JPEG
|
val format = if (File(path).extension.toLowerCase() == "png") TextureFormat.PNG else TextureFormat.JPEG
|
||||||
val bimg = ImageIO.read(File(path)) //image for obtaining resolution
|
val bimg = ImageIO.read(File(path)) //image for obtaining resolution
|
||||||
val resolution = Pair(bimg.height, bimg.width)
|
val resolution = Pair(bimg.width, bimg.height)
|
||||||
val cal = Calendar.getInstance() //calendar obj with current time
|
val cal = Calendar.getInstance() //calendar obj with current time
|
||||||
val hash = Sha256(data)
|
val hash = Sha256(data)
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ class MainViewController : Controller() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DetailView actions
|
// MainView actions
|
||||||
|
|
||||||
fun cvSearchAction(tags: ObservableList<String>) {
|
fun cvSearchAction(tags: ObservableList<String>) {
|
||||||
// show spinner, block ui
|
// show spinner, block ui
|
||||||
|
|
|
@ -66,7 +66,7 @@ impl QueryFilter {
|
||||||
|
|
||||||
SpecialInName(name) => Score::RequiredMatch(
|
SpecialInName(name) => Score::RequiredMatch(
|
||||||
//
|
//
|
||||||
texture.name.contains(name),
|
texture.name.to_lowercase().contains(&name.to_lowercase()),
|
||||||
),
|
),
|
||||||
|
|
||||||
SpecialBeforeDate(date) => Score::RequiredMatch(texture.added_on <= *date),
|
SpecialBeforeDate(date) => Score::RequiredMatch(texture.added_on <= *date),
|
||||||
|
|
Loading…
Reference in New Issue