gyroninja
/
netrunner
4
5
Fork 2
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitgud.io/odilitime/netrunner

pull/2/head
Nubben 5 years ago
parent
a60e93a026 919022565f
commit
66f3ce8f42
6 changed files with 112 additions and 249 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      deps/getdeps_lnx.sh
  2. 9
      reltools/linux/package_from_linux.sh
  3. 6
      src/graphics/opengl/Window.cpp
  4. 2
      src/networking/HTTPRequest.h
  5. 222
      src/networking/URI.cpp
  6. 23
      src/networking/URI.h

99
deps/getdeps_lnx.sh vendored
Unescape View File

@ -0,0 +1,99 @@ @@ -0,0 +1,99 @@
#!/bin/bash
echo "Set up dir"
mkdir build
cd build
echo "Downloading files"
if [ ! -f "glew-2.0.0.tgz" ]; then
curl -L https://github.com/nigels-com/glew/releases/download/glew-2.0.0/glew-2.0.0.tgz > glew-2.0.0.tgz
fi
if ! type "cmake" > /dev/null; then
if [ ! -f "cmake-3.9.0.tar.gz" ]; then
curl https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz > cmake-3.9.0.tar.gz
fi
fi
if [ ! -f "glfw3.2.1.tar.gz" ]; then
curl -L https://github.com/glfw/glfw/archive/3.2.1.tar.gz > glfw3.2.1.tar.gz
fi
if ! type "pkg-config" > /dev/null; then
if [ ! -f "pkg-config-0.29.tar.gz" ]; then
curl https://pkg-config.freedesktop.org/releases/pkg-config-0.29.tar.gz > pkg-config-0.29.tar.gz
fi
fi
if [ ! -f "freetype-2.8.tar.gz" ]; then
curl -L http://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.gz > freetype-2.8.tar.gz
fi
if [ ! -f "harfbuzz-1.4.7.tar.bz2" ]; then
curl -L https://github.com/behdad/harfbuzz/releases/download/1.4.7/harfbuzz-1.4.7.tar.bz2 > harfbuzz-1.4.7.tar.bz2
fi
if [ ! -f "md5sum.c" ]; then
curl https://spit.mixtape.moe/view/raw/765a1dc1 > md5sum.c
fi
echo "Extracing files"
tar zxf glew-2.0.0.tgz
if ! type "cmake" > /dev/null; then
tar zxf cmake-3.9.0.tar.gz
fi
tar zxf glfw3.2.1.tar.gz
if ! type "pkg-config" > /dev/null; then
tar zxf pkg-config-0.29.tar.gz
fi
tar zxf freetype-2.8.tar.gz
tar jxf harfbuzz-1.4.7.tar.bz2
physicalCpuCount=$([[ $(uname) = 'Darwin' ]] &&
sysctl -n hw.physicalcpu_max ||
lscpu -p | egrep -v '^#' | sort -u -t, -k 2,4 | wc -l)
echo "Configured for $physicalCpuCount CPUs"
if [ -d "cmake-3.9.0" ]; then
echo "Installing CMake"
cd cmake-3.9.0
sh configure --parallel=$physicalCpuCount
make -j$physicalCpuCount
echo "Prompting for local user password for installation"
sudo make install
cd ..
fi
echo "Installing GLEW"
cd glew-2.0.0
make -j$physicalCpuCount
echo "Prompting for local user password for installation"
sudo make install
cd ..
echo "Installing GLFW"
cd glfw-3.2.1
cmake .
make -j$physicalCpuCount
sudo make install
cd ..
if [ -d "pkg-config-0.29" ]; then
echo "Installing pkg-config"
cd pkg-config-0.29
env LDFLAGS="-framework CoreFoundation -framework Carbon" ./configure --with-internal-glib
make -j$physicalCpuCount
sudo make install
cd ..
fi
echo "Installing FreeType"
cd freetype-2.8
sh configure
make -j$physicalCpuCount
sudo make install
cd ..
echo "Installing HarfBuzz"
cd harfbuzz-1.4.7
sh configure --with-freetype=yes
make -j$physicalCpuCount
sudo make install
cd ..
echo "Installing md5sum"
gcc md5sum.c -o md5sum
chmod u+x md5sum
sudo cp md5sum /usr/local/bin
echo "Restoring pwd"
cd ..

9
reltools/linux/package_from_linux.sh
Unescape View File

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
#!/bin/bash
mkdir netrunner-$(date +%F)
cd netrunner-$(date +%F)
cp ../../../*.ttf .
cp ../../../netrunner .
cd ..
tar zcf netrunner-$(date +%F)-linux.tar.gz netrunner-$(date +%F)
rm -fr netrunner-$(date +%F)
# https://gitgud.io/snippets/29

6
src/graphics/opengl/Window.cpp
Unescape View File

@ -5,12 +5,12 @@ @@ -5,12 +5,12 @@
#include "../../html/TextNode.h"
#include "../../networking/HTTPRequest.h"
#include "../../html/HTMLParser.h"
#include "StringUtils.h"
#include "../../StringUtils.h"
#include "../../URL.h"
#include "../../Log.h"
#include <cmath>
#include <ctime>
#include <iostream>
#include "URL.h"
#include "Log.h"
void deleteComponent(std::shared_ptr<Component> &component);
void deleteNode(std::shared_ptr<Node> node);

2
src/networking/HTTPRequest.h
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#define HTTPREQUEST_H
#include "HTTPResponse.h"
#include "URL.h"
#include "../URL.h"
#include <functional>
#include <string>

222
src/networking/URI.cpp
Unescape View File

@ -1,222 +0,0 @@ @@ -1,222 +0,0 @@
#include "../StringUtils.h"
#include "URI.h"
#include <algorithm>
#include <iostream>
#include <memory>
#include <string>
#ifndef VERSION
std::string stringToLower(std::string s);
std::string stringToLower(std::string s) {
std::transform(s.begin(), s.end(), s.begin(),
[](unsigned char c){ return std::tolower(c); });
return s;
}
#endif
/*
* From the following RFC: https://tools.ietf.org/html/rfc3986
*
* pct-encoded = "%" HEXDIG HEXDIG
* reserved = gen-delims / sub-delims
* gen-delims = ":" / "/" / "?" / "#" / "[" / "]" / "@"
* sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
* / "*" / "+" / "," / ";" / "="
*
*/
enum uri_parse_state {
SCHEME,
FIRST_SLASH,
SECOND_SLASH_OR_ELSE,
AUTHORITY,
AUTHORITY_USERINFO, /* The part before '@' */
AUTHORITY_PASSWORD, /* RFC states that we should either reject or ignore it (We ignore it) */
AUTHORITY_HOST,
AUTHORITY_PORT,
PATH,
QUERY,
FRAGMENT,
};
std::unique_ptr<URI> parseUri(std::string raw) {
std::unique_ptr<URI> uri = std::make_unique<URI>();
uri->path = "/";
unsigned int cursor = 0;
unsigned int last = 0;
unsigned int last_semicolon = 0;
enum uri_parse_state state = SCHEME;
// First character of scheme MUST be alphabetic
if (!isalpha(raw[cursor])) {
std::cout << "parse scheme error" << std::endl;
return NULL;
}
for (cursor = 1; cursor < raw.length(); cursor++) {
/* TODO
* Allow scheme-less uri (and fallback to https/http) */
if (state == SCHEME) {
if (raw[cursor] == ':') {
uri->scheme = stringToLower(raw.substr(0, cursor));
/* TODO
* Put default port now (Should use a table for that but
* I don't know C++ enough) */
if (uri->scheme == "http") {
uri->authority.port = 80;
}
state = FIRST_SLASH;
} else if (!isalpha(raw[cursor]) && !isdigit(raw[cursor]) && raw[cursor] != '+' &&
raw[cursor] != '-' && raw[cursor] != '.') {
std::cout << "parse scheme error" << std::endl;
return NULL;
}
} else if (state == FIRST_SLASH) {
if (raw[cursor] == '/') {
state = SECOND_SLASH_OR_ELSE;
} else {
std::cout << "parse error" << std::endl;
}
} else if (state == SECOND_SLASH_OR_ELSE) {
if (raw[cursor] == '/') {
last = cursor + 1;
state = AUTHORITY;
} else {
// TODO Handle this, URI may have only one slash
}
} else if (state == AUTHORITY) {
/* At this point, this could either be the semi colon for
* the password or for the port*/
if (raw[cursor] == ':') {
last_semicolon = cursor;
} else if (raw[cursor] == '@') {
uri->authority.userinfo = raw.substr(last, cursor - last);
last = cursor + 1;
state = AUTHORITY_HOST;
// Authority is finished, everything should be considered as the host[port].
// TODO terminated by the next slash ("/"), question mark ("?"), or number sign ("#") character, or by the end of the URI.
// What to do when ? and # ?
} else if (raw[cursor] == '/') {
if (last_semicolon > 0) {
// TODO Validate port
if (cursor - last_semicolon - 1 > 0) {
uri->authority.port = std::stoi(raw.substr(last_semicolon+1, cursor - last_semicolon+1));
}
uri->authority.host = raw.substr(last, last_semicolon - last);
} else {
uri->authority.host = raw.substr(last, cursor - last);
}
last = cursor;
cursor--;
state = PATH;
} else if (raw[cursor] == '?' || raw[cursor] == '#') {
uri->authority.host = raw.substr(last, cursor - last);
last = cursor;
if (raw[cursor] == '?') {
state = QUERY;
} else {
state = FRAGMENT;
}
} else if (cursor + 1 == raw.length()) {
uri->authority.host = raw.substr(last, last_semicolon - last);
uri->path = "/";
break;
}
} else if (state == AUTHORITY_HOST) {
if (raw[cursor] == ':') {
uri->authority.host = raw.substr(last, cursor - last);
last = cursor+1;
state = AUTHORITY_PORT;
} else if (raw[cursor] == '/') {
uri->authority.host = raw.substr(last, cursor - last);
last = cursor;
cursor--;
state = PATH;
}
} else if (state == AUTHORITY_PORT) {
if (raw[cursor] == '/') {
if (cursor - last > 0) {
uri->authority.port = std::stoi(raw.substr(last, cursor - last));
}
last = cursor;
cursor--;
state = PATH;
} else if (!isdigit(raw[cursor])) {
}
} else if (state == PATH) {
if (raw[cursor] == '?' || raw[cursor] == '#') {
uri->path = raw.substr(last, cursor - last);
last = cursor;
if (raw[cursor] == '?') {
state = QUERY;
} else {
state = FRAGMENT;
}
} else if (cursor + 1 == raw.length()) {
uri->path = raw.substr(last, cursor + 1 - last);
break;
}
} else if (state == QUERY) {
if (raw[cursor] == '#') {
uri->query = raw.substr(last + 1, cursor - last - 1);
last = cursor;
state = FRAGMENT;
} else if (cursor + 1 == raw.length()) {
uri->query = raw.substr(last + 1, cursor + 1 - last);
break;
}
} else if (state == FRAGMENT) {
if (cursor + 1 == raw.length()) {
uri->fragment = raw.substr(last + 1, cursor + 1 - last);
break;
}
}
}
return uri;
}
#ifndef VERSION
void test_parser(std::string url, std::string scheme, std::string userinfo,
std::string host, int port, std::string path, std::string query, std::string fragment) {
std::unique_ptr<URI> uri = parseUri(url);
if (uri->scheme == scheme && uri->authority.userinfo == userinfo &&
uri->authority.host == host && uri->authority.port == port &&
uri->path == path && uri->query == query && uri->fragment == fragment) {
std::cout << "noice" << std::endl;
} else {
std::cout << "nope" << std::endl;
std::cout << uri->scheme << " vs " << scheme << std::endl;
std::cout << uri->authority.userinfo << " vs " << userinfo << std::endl;
std::cout << uri->authority.host << " vs " << host << std::endl;
std::cout << uri->authority.port << " vs " << port << std::endl;
std::cout << uri->path << " vs " << path << std::endl;
std::cout << uri->query << " vs " << query << std::endl;
std::cout << uri->fragment << " vs " << fragment << std::endl;
}
}
int
main(void) {
test_parser("HTTP://username:password@www.example.org:8080/", "http", "username:password", "www.example.org", 8080, "/", "", "");
test_parser("http://username:password@www.example.org:8080/", "http", "username:password", "www.example.org", 8080, "/", "", "");
test_parser("http://www.example.org:8080/", "http", "", "www.example.org", 8080, "/", "", "");
test_parser("http://www.example.org/", "http", "", "www.example.org", 80, "/", "", "");
test_parser("http://www.example.org", "http", "", "www.example.org", 80, "/", "", "");
//test_parser("http://www.example.org//", "http", "", "www.example.org", 80, "/", "", "");
test_parser("http://www.example.org/this/path", "http", "", "www.example.org", 80, "/this/path", "", "");
test_parser("http://www.example.org:/this/path", "http", "", "www.example.org", 80, "/this/path", "", "");
test_parser("http://username:password@www.example.org:/this/path", "http", "username:password", "www.example.org", 80, "/this/path", "", "");
test_parser("http://username:password@www.example.org/", "http", "username:password", "www.example.org", 80, "/", "", "");
test_parser("http://username:passwor:d@www.example.org/", "http", "username:passwor:d", "www.example.org", 80, "/", "", "");
test_parser("http://username:passwor:d@www.example.org:9090/", "http", "username:passwor:d", "www.example.org", 9090, "/", "", "");
test_parser("http://username:passwor:d@www.example.org:9090/this/path?query", "http", "username:passwor:d", "www.example.org", 9090, "/this/path", "query", "");
test_parser("http://www.example.org:9090/this/path?query", "http", "", "www.example.org", 9090, "/this/path", "query", "");
test_parser("http://www.example.org/this/path?query", "http", "", "www.example.org", 80, "/this/path", "query", "");
test_parser("http://www.example.org?query", "http", "", "www.example.org", 80, "/", "query", "");
test_parser("http://www.example.org/?query", "http", "", "www.example.org", 80, "/", "query", "");
test_parser("http://www.example.org?query#fragment", "http", "", "www.example.org", 80, "/", "query", "fragment");
test_parser("http://www.example.org/#fragment", "http", "", "www.example.org", 80, "/", "", "fragment");
test_parser("http://www.example.org#fragment", "http", "", "www.example.org", 80, "/", "", "fragment");
}
#endif

23
src/networking/URI.h
Unescape View File

@ -1,23 +0,0 @@ @@ -1,23 +0,0 @@
#ifndef URI_H
#define URI_H
#include <memory>
#include <string>
struct Authority {
std::string userinfo;
std::string host;
int port;
};
struct URI {
std::string scheme;
struct Authority authority; /* Can be empty */
std::string path;
std::string query; // ?blablabla=asdfasf....
std::string fragment; // #asfawefm
};
std::unique_ptr<URI> parseUri(std::string raw);
#endif
Write Preview
Loading…
Cancel
Save