Skip to content
This repository has been archived by the owner on Apr 22, 2021. It is now read-only.

Removing unused imports. #304

Open
wants to merge 122 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
c3591f7
clarification of error message
Tehrasha Jan 28, 2019
1674c4e
Make config file loader take ram in MB for consistency
finnbear Feb 3, 2019
b220ca5
Merge pull request #174 from finnbear/patch-1
laurent-clouet Feb 8, 2019
eb8958b
Merge pull request #175 from Tehrasha/patch-1
laurent-clouet Feb 8, 2019
5550cf7
fix missing parenthese in Job.java:808
MCOfficer Feb 9, 2019
3327c7b
Fix wrong value name in Client.java:614
MCOfficer Feb 9, 2019
c851987
Merge pull request #176 from MCOfficer/build-fix
laurent-clouet Feb 9, 2019
6c52868
Add info about renderable project for this session: number of project…
Feb 10, 2019
9dfdb35
Bugfix: ram is already in kB
Feb 14, 2019
08a2ce5
Memory amount should be in long not int
Feb 20, 2019
45c664c
Max memory settings can be set using human number with unit
Feb 20, 2019
5088cd4
When fail with python error, cleaning directory in hope to recover
Feb 22, 2019
6756f93
cleaning directory in hope to recover
Feb 23, 2019
38b77d4
Bugfix: wrong next request time detection
Mar 6, 2019
34ab0d5
Fix grammar and consistency of README
finnbear Mar 23, 2019
54c55bf
Merge pull request #178 from finnbear/patch-2
laurent-clouet Mar 23, 2019
ef20116
Utils.parseNumber can generate NumberFormatException
Apr 3, 2019
7a2bcf6
Adding option to collapse panels in settings
robinjon89 May 3, 2019
8b2d5f5
Fix: do not use gpu order to set its id, instead use the same method …
Jul 9, 2019
cefffa4
Display human error on lost of internet connectivity
Jul 12, 2019
1bbc5db
Fix: hour display format
laurent-clouet Jul 18, 2019
800c85d
More error detection
Jul 21, 2019
6b71f9f
Update .travis.yml
laurent-clouet Jul 23, 2019
a7e2431
Better error detection
Aug 5, 2019
56a7bf9
code cleanup
Aug 5, 2019
0c80b39
Slow update of ui was made for the javascript ui, since it's not used…
Aug 7, 2019
fe1e17f
Fix: update process remaing time on 'part' method
Aug 7, 2019
21d850c
Remove blend files after the render has started
Aug 7, 2019
b08055d
Cleaner version of removing project's directory
Aug 7, 2019
7b40ab5
Cleanup
Aug 7, 2019
55de1c7
Default version
Aug 7, 2019
d6b7d04
Use lombok annotation instead of get/set
Aug 7, 2019
ede8195
Migrate from ant to gradle
Aug 10, 2019
8f3a099
update wrapper
Aug 11, 2019
e012bf5
Update README.md
laurent-clouet Aug 11, 2019
dcf7ab1
Moving to Intellij IDEA
Aug 11, 2019
685b3c7
Fix: all the directory cannot be removed because blender will reload …
Aug 22, 2019
dee6374
Feature: do not store the passwrd as plain text but instead use a pub…
Aug 22, 2019
52ad13c
Update travis settings
Aug 22, 2019
81cba7d
Use an xml (de)serializer to create Java object instead of parsing th…
Sep 3, 2019
00ff4bb
2.80's tile size recomandation is 32x32
Sep 4, 2019
76f49d7
Last download status could be 99% instead of 100%
Sep 5, 2019
18e9e75
Display global stats even when the session has no job
Sep 9, 2019
73a98e4
Save config file
Sep 15, 2019
2a8f324
Bugfix: GPU could be on the same bus (and having the same pci bus id)
laurent-clouet Nov 6, 2019
1451f41
Fix: opencl gpu id
FluxTape Jan 2, 2020
9a18387
Fix: in case of error, the publickey is not sent
Jan 12, 2020
ddee2a5
Fix: nullpointerexception
Jan 12, 2020
f0ba85b
Slightly improve logging messages
DaCoolX Feb 23, 2020
9e432a6
Merge pull request #197 from DaCoolX/patch-1
laurent-clouet Feb 24, 2020
caeb791
Feature: Show progress bar in systray icon
Mar 19, 2020
c4ab8fe
Resolve compiler warnings (#200)
andylizi Apr 9, 2020
6598912
Improve status messages (#202)
luguina Apr 11, 2020
4ffb409
fix: add a space after the h and min to format/show the human duratio…
luguina Apr 12, 2020
3c2a5e1
feature: light/dark mode theme support (#208)
luguina Apr 14, 2020
c79c8ed
Feat: Don't do last render image request, use local image
Apr 14, 2020
b90d9b0
Feat: change the architecture of the 'sheepit network', instead of st…
Apr 14, 2020
00e2aca
fix: background uploads queuing not working properly (#209)
luguina Apr 15, 2020
a1de5bc
feature: improve user information on queued uploads (#210)
luguina Apr 19, 2020
7cea3ee
Cleanup dependencies (#201)
andylizi Apr 26, 2020
a6b2617
Improve the pause button screen workflow (#216)
luguina Apr 26, 2020
4a0a326
Feature: improve the application exit-button process (#214)
luguina Apr 27, 2020
d5ee95f
Fix: JAXB NoClassDefFoundError on Java 9+ (#218)
andylizi Apr 28, 2020
3e4719e
fix: a ghost project is created when a job upload fails (#222)
luguina May 9, 2020
32d1679
Fix: racing condition with messages when the queue is full (#223)
luguina May 11, 2020
93b3082
Fix: NullPointerException
May 13, 2020
7fad87c
Allow the user to configure the GPU render bucket size (#220)
luguina May 16, 2020
68a087b
Improve waiting messages to show the time of the next retry. (#225)
luguina May 16, 2020
91edd37
Add new type of errror
May 16, 2020
d5abaa6
Fix: ugly JavaException when failing to generate thumbnail in SWING c…
luguina May 16, 2020
9457475
Optimise the retries algorithm for the "no job" server response (#230)
luguina May 20, 2020
1775862
Fix: app randomly hung when the upload queue is full (#231)
luguina May 23, 2020
0bd5bbf
Fix: EEVEE renders with CPU instead of GPU in Linux clients (#229)
luguina May 24, 2020
5acdd02
Code formator (#236)
laurent-clouet May 28, 2020
3355be8
Fix: pause request is lost when a "no-job" response is received from …
luguina May 28, 2020
a6cdb2c
Review and improve error messages. (#234)
luguina May 28, 2020
be37abf
Fix: priority functionality not working properly (#232)
luguina May 28, 2020
baa8c68
Replace standard Java HTTP libraries with okHTTP (#237)
luguina Jun 1, 2020
9ea2a1d
Fix: remove certificate bypass (#240)
luguina Jun 2, 2020
f8c092d
Include a header in error log with the information summarised for eas…
luguina Jun 2, 2020
44d9b84
Feature: add timestamp information to text UIs (#241)
luguina Jun 2, 2020
75b7300
Fix: error report not sent when no job allocated (#245)
luguina Jun 4, 2020
41f3f74
Feature: include app version in Settings screen (#247)
luguina Jun 5, 2020
2cd1987
Refactor: remove unused imports (#248)
luguina Jun 6, 2020
0aa8f8b
Remove the 5 minutes wait for the RENDERER_KILLED_BY_USER_OVER_TIME e…
luguina Jun 8, 2020
d45b514
Feature: minimize to SysTray option on the settings screen (#246)
luguina Jun 9, 2020
2aa98b2
Fix: Job killed by time limit is incorrectly catalogued as NO_FILE_OU…
luguina Jun 12, 2020
324f773
Feature: in text UI, show downloads in a single-line (#250)
luguina Jun 14, 2020
0644d33
Fix: remove unused checkpoints from memory (#258)
luguina Jun 16, 2020
6054808
Fix: include any unhandled error response from server in error logs (…
luguina Jun 16, 2020
8dddb61
Refactor: update deprecated call to method to latest version (#262)
luguina Jun 17, 2020
25c5eda
Fix: HTTPSendFile doesn't send a valid MimeType header to server (#263)
luguina Jun 17, 2020
329b6e4
Feat: in text UIs, show render progress in one line (#257)
luguina Jun 17, 2020
6edfeca
Fix: RENDERER_KILLED error sends a frame reset to server (#259)
luguina Jun 18, 2020
1160ee0
Fix: Send reset signal to server on job upload error (#260)
luguina Jun 18, 2020
448a4be
Fix: -compute-method not set when configuration file present (#268)
luguina Jun 20, 2020
dc0c9f9
Feat: include Java version in HTTP User-Agent (#269)
luguina Jun 20, 2020
1c99e00
Fix: allow to cancel download by user or server initiated reset (#266)
luguina Jun 20, 2020
4c3fa7c
Feature: check for HTTP 413 (Entity too large) errors (#264)
luguina Jun 20, 2020
90137a3
Fix: unable to show the message error in case of HTTP return code != …
luguina Jun 21, 2020
9753859
Fix: add RENDERER_KILLED_BY_USER to download checks (#271)
luguina Jun 21, 2020
a4b5493
Fix: NULL MimeType when sending files without extension (#270)
luguina Jun 21, 2020
2b2e5cc
Fix: -renderbucket-size value not applied to GPU render (#256)
luguina Jun 21, 2020
0674539
Include public key as password in help (#276)
DaCoolX Jun 26, 2020
2bdefa7
Detect if the client is runnig headless
Jul 3, 2020
081c20f
Fix failed MimeType detection (#277)
MCOfficer Jul 7, 2020
674a375
Fix: NullPointerException triggered when http error in job allocation…
luguina Jul 7, 2020
35bdb7a
Java 8 is the minimum version
laurent-clouet Jul 25, 2020
25bbad9
fix broken stack trace printer (#283)
ChucklesTheBeard Jul 26, 2020
b0ad89e
Feature: allow the client to shut down the computer at or after a cer…
luguina Jul 27, 2020
3244beb
restore missing time remaining time in UI with openCL (#282)
tuxun Jul 28, 2020
549024c
Fix: Make initial Test/Power Frames ignore user maximum render time s…
luguina Aug 29, 2020
98d85b4
Fix: Display error & stop retrying in case of test frames render erro…
luguina Aug 29, 2020
4d400b8
Ref: rename variable
laurent-clouet Aug 29, 2020
74b6002
Update README.md
laurent-clouet Aug 29, 2020
8d2ca61
Cleanup: remove unused imports (#294)
luguina Sep 7, 2020
e866299
Feature: Make -hostname a cmd line variable (#290)
luguina Sep 9, 2020
83ab21b
Updates usage command (#296)
gatewaytofredom Sep 11, 2020
17d45f6
Feature: add session data consumption information in GUI/text UIs (#287)
luguina Sep 12, 2020
eae4b5b
Fix: division per zero
Sep 12, 2020
5ddfd67
Handle new protocole value
laurentclouetarkea Oct 10, 2020
4ed0b9e
Removing unused imports.
Oct 11, 2020
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
11 changes: 0 additions & 11 deletions .classpath

This file was deleted.

9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_size = 4
indent_style = tab
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.idea/workspace.xml
.gradle
build
bin
out

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions .project

This file was deleted.

3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: java
script: ant
dist: trusty

os:
- linux


# safelist
branches:
only:
Expand Down
19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@ SheepIt Render Farm Client is an *Open Source* client for the distributed render

## Compilation

You need Java 1.7 or more. (OpenJDK and Oracle are both supported).
You also need [ant](http://ant.apache.org/).
To create the jar file, simply type `ant` in the project's root directory.
You will need Java 1.8 or higher. (OpenJDK and Oracle are both supported).
To create the jar file, simply type `./gradlew shadowJar` on linux/OSX and `gradlew.bat shadowJar` on Windows in the project's root directory.

## Usage

Once you have a jar file, you can view the usage by running:
Once you have the jar file, you can see how to use it by running:

java -jar bin/sheepit-client.jar --help
java -jar build/libs/sheepit-client-all.jar --help

When you are doing development work, you can use a mirror of the main site specially made for demo/dev. The mirror is located at **http://sandbox.sheepit-renderfarm.com**, and you can use it by passing `-server http://sandbox.sheepit-renderfarm.com` to your invocation of the client.

At the command line ui (-ui text / -ui oneLine) you could type in the following commands and press enter to controll the client:
At the command line ui (-ui text / -ui oneLine) you could type in the following commands and press enter to control the client:

* status: to get the current status of the client (paused, stoped, ...)
* priority <n>: to set the renderer process priority
* block: to block the current project
* status: get the current status of the client (paused, stoped, etc.)
* priority <n>: set the renderer process priority
* block: block the current project
* pause: pause the client to request new jobs after the current frame has finished to render
* resume: resume the client after it was paused
* stop: stop the client after the current frame has finished
* cancel: cancel the stop request
* quit: stops the client directly without finishing the current frame
* quit: stop the client directly without finishing the current frame
70 changes: 70 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
}
}
apply plugin: 'java'
apply plugin: 'com.github.johnrengelman.shadow'

sourceCompatibility = '1.8'
targetCompatibility = '1.8'

compileJava {
// Suppress warnings about internal api usage - https://stackoverflow.com/a/19553686/6238618
options.fork = true
options.forkOptions.executable = 'javac'
options.compilerArgs << '-XDignore.symbol.file'
}

shadowJar {
exclude 'OSGI-OPT/' // args4j garbage
}

repositories {
jcenter()
mavenCentral()
}

dependencies {
compileOnly 'org.projectlombok:lombok:1.18.12'
annotationProcessor 'org.projectlombok:lombok:1.18.12'

compile 'args4j:args4j:2.33'
compile 'net.lingala.zip4j:zip4j:1.3.3'
compile 'net.java.dev.jna:jna-platform:5.0.0'
compile 'org.simpleframework:simple-xml:2.7.1'
compile 'javax.xml.bind:jaxb-api:2.3.1'
implementation 'com.formdev:flatlaf:0.30'
implementation 'com.squareup.okhttp3:okhttp:4.7.2'
implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.7.2'
}

jar {
manifest {
attributes "Main-Class": "com.sheepit.client.standalone.Worker"
}

from {
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
}
}

sourceSets {
main {
java {
srcDirs = ['src']
}
resources {
srcDirs = ['resources']
}
}

test {
java {
srcDirs = ['test']
}
}
}
69 changes: 0 additions & 69 deletions build.xml

This file was deleted.

Loading