Skip to content

Commit 4a9d103

Browse files
committed
Version 0.6.1 (including MOTD and docs changes)
1 parent 062dc87 commit 4a9d103

File tree

8 files changed

+17
-10
lines changed

8 files changed

+17
-10
lines changed

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
News
22
====
3+
- **2017-05-01:** BitWrk 0.6.1 fixes a bug that affected Windows users
34
- **2017-04-23:** Release of BitWrk 0.6.0 (Mars) brings local network rendering and usability enhancements for Blender
45
- **2017-04-17:** Release candidate 1 of BitWrk 0.6.0
56
- **2017-04-05:** BitWrk got [featured in Bitcoin Magazine](https://bitcoinmagazine.com/articles/soon-youll-be-able-buy-and-sell-system-resources-p2p-bitcoin/)

QUICKSTART.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ You need at least Blender 2.76 (Blender 2.78 is recommended).
1515

1616
Download the BitWrk binary release specific your OS and unpack it somewhere.
1717

18-
Download **render_bitwrk-0.6.0.zip** and install it as a Blender add-on (see [Blender Manual](https://docs.blender.org/manual/en/dev/preferences/addons.html)).
18+
Download **render_bitwrk-[version].zip** and install it as a Blender add-on (see [Blender Manual](https://docs.blender.org/manual/en/dev/preferences/addons.html)).
1919

2020
In the settings of the Blender add-on there is an option to select which BitWrk client you would like to start. Select the executable from the archive you downloaded (bitwrk-client.exe or just bitwrk-client). Click on "Start BitWrk client".
2121

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ BitWrk provides a service to both groups by connecting them in an easy-to-use wa
3030
Status
3131
------
3232

33-
As of version 0.6.0:
33+
As of version 0.6.1:
3434
- BitWrk concentrates on the use case of providing peer-to-peer rendering for [Blender](http://blender.org),
3535
the free rendering software, into which it integrates by use of an add-on. A feature often requested by
3636
Blender users is local network rendering, even for single frames. By providing local workers with local

bitwrk-blender/render_bitwrk/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
bl_info = {
2222
"name": "BitWrk Distributed Rendering",
23-
"description": "Support for distributed rendering using BitWrk, a marketplace for computing power",
23+
"description": "A peer-to-peer rendering service",
2424
"author": "Jonas Eschenburg",
25-
"version": (0, 6, 0),
25+
"version": (0, 6, 1),
2626
"blender": (2, 76, 0),
2727
"category": "Render",
2828
}

bitwrk-server/src/github.com/indyjo/bitwrk-server/server_motd.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ type motd struct {
2929
Warning bool
3030
}
3131

32+
// Handler for the /motd URL path. Returns a JSON document containing a message for the user.
3233
func handleMessageOfTheDay(w http.ResponseWriter, r *http.Request) {
3334
m := getMessageOfTheDay(r)
3435

@@ -43,6 +44,7 @@ func handleMessageOfTheDay(w http.ResponseWriter, r *http.Request) {
4344

4445
var uaRegexp = regexp.MustCompile("^BitWrkGoClient/([0-9]{1,4})\\.([0-9]{1,4})\\.([0-9]{1,4})")
4546

47+
// Returns a message based on analyzing the HTTP "User-Agent" header.
4648
func getMessageOfTheDay(r *http.Request) motd {
4749
ua := r.Header.Get("User-Agent")
4850
matches := uaRegexp.FindStringSubmatch(ua)
@@ -54,14 +56,18 @@ func getMessageOfTheDay(r *http.Request) motd {
5456
minor, _ := strconv.ParseInt(matches[2], 10, 16)
5557
micro, _ := strconv.ParseInt(matches[3], 10, 16)
5658

57-
if major > 0 || major == 0 && (minor > 6 || minor == 6 && micro >= 0) {
59+
const currentMajor = 0
60+
const currentMinor = 6
61+
const currentMicro = 1
62+
63+
if major > currentMajor || major == currentMajor && (minor > currentMinor || minor == currentMinor && micro >= currentMicro) {
5864
return motd{fmt.Sprintf("Welcome to the BitWrk network!"+
5965
" Your client is up to date (version %d.%d.%d).", major, minor, micro), false}
6066
} else {
61-
return motd{fmt.Sprintf("BitWrk proudly announces version 0.6.0!"+
67+
return motd{fmt.Sprintf("BitWrk proudly announces version %v.%v.%v!"+
6268
" You are currently running client version %d.%d.%d."+
6369
" For information on what's new and how to upgrade please visit"+
6470
" <a target=\"_blank\" href=\"https://bitwrk.net/\">bitwrk.net</a>.",
65-
major, minor, micro), true}
71+
currentMajor, currentMinor, currentMicro, major, minor, micro), true}
6672
}
6773
}

documentation/preparing_releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Client-side code changes
99
------------------------
1010
- blender-slave.py: Verify that get\_blender\_version supports the
1111
correct set of versions and prints the right message
12-
- render\_bitwrk.py: bl_info contains version number
12+
- render\_bitwrk/\_\_init\_\_.py: bl_info contains version number
1313
- client_version.go: ClientVersion contains version number
1414
- info.json: Contains version number
1515

share/bitwrk-client/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"info": "bitwrk-client resource files",
3-
"version": "0.6.0"
3+
"version": "0.6.1"
44
}
55

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package main
22

3-
const ClientVersion = "0.6.0"
3+
const ClientVersion = "0.6.1"

0 commit comments

Comments
 (0)