Skip to content

Fix compilation issues for target armv7-unknown-linux-gnueabihf #69

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

Merged
mickvandijke merged 1 commit into from
Aug 14, 2022
Merged

Fix compilation issues for target armv7-unknown-linux-gnueabihf #69

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
144 changes: 48 additions & 96 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ lto = "fat"
strip = true

[dependencies]
tokio = { version = "1.7", features = ["full"] }
tokio = { version = "1.7", features = ["rt-multi-thread", "net", "sync", "macros", "signal"] }

serde = { version = "1.0", features = ["derive"] }
serde_bencode = "^0.2.3"
Expand All @@ -29,6 +29,8 @@ hex = "0.4.3"
percent-encoding = "2.1.0"
binascii = "0.1"

openssl = { version = "0.10.41", features = ["vendored"] }

warp = { version = "0.3", features = ["tls"] }

config = "0.11"
Expand All @@ -40,7 +42,7 @@ chrono = "0.4"

r2d2 = "0.8.8"
r2d2_mysql = "21.0.0"
r2d2_sqlite = "0.16.0"
r2d2_sqlite = { version = "0.21.0", features = ["bundled"] }

rand = "0.8.4"
derive_more = "0.99"
Expand Down
23 changes: 11 additions & 12 deletions src/databases/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use async_trait::async_trait;
use log::debug;
use r2d2::Pool;
use r2d2_sqlite::SqliteConnectionManager;
use r2d2_sqlite::rusqlite::NO_PARAMS;

use crate::{InfoHash};
use crate::databases::database::{Database, Error};
Expand Down Expand Up @@ -50,9 +49,9 @@ impl Database for SqliteDatabase {

let conn = self.pool.get().map_err(|_| database::Error::DatabaseError)?;

conn.execute(&create_whitelist_table, NO_PARAMS)
.and_then(|_| conn.execute(&create_keys_table, NO_PARAMS))
.and_then(|_| conn.execute(&create_torrents_table, NO_PARAMS))
conn.execute(&create_whitelist_table, [])
.and_then(|_| conn.execute(&create_keys_table, []))
.and_then(|_| conn.execute(&create_torrents_table, []))
.map_err(|_| database::Error::InvalidQuery)
.map(|_| ())
}
Expand All @@ -62,7 +61,7 @@ impl Database for SqliteDatabase {

let mut stmt = conn.prepare("SELECT info_hash, completed FROM torrents")?;

let torrent_iter = stmt.query_map(NO_PARAMS, |row| {
let torrent_iter = stmt.query_map([], |row| {
let info_hash_string: String = row.get(0)?;
let info_hash = InfoHash::from_str(&info_hash_string).unwrap();
let completed: u32 = row.get(1)?;
Expand All @@ -79,7 +78,7 @@ impl Database for SqliteDatabase {

let mut stmt = conn.prepare("SELECT key, valid_until FROM keys")?;

let keys_iter = stmt.query_map(NO_PARAMS, |row| {
let keys_iter = stmt.query_map([], |row| {
let key = row.get(0)?;
let valid_until: i64 = row.get(1)?;

Expand All @@ -99,7 +98,7 @@ impl Database for SqliteDatabase {

let mut stmt = conn.prepare("SELECT info_hash FROM whitelist")?;

let info_hash_iter = stmt.query_map(NO_PARAMS, |row| {
let info_hash_iter = stmt.query_map([], |row| {
let info_hash: String = row.get(0)?;

Ok(InfoHash::from_str(&info_hash).unwrap())
Expand All @@ -113,7 +112,7 @@ impl Database for SqliteDatabase {
async fn save_persistent_torrent(&self, info_hash: &InfoHash, completed: u32) -> Result<(), database::Error> {
let conn = self.pool.get().map_err(|_| database::Error::DatabaseError)?;

match conn.execute("INSERT INTO torrents (info_hash, completed) VALUES (?1, ?2) ON CONFLICT(info_hash) DO UPDATE SET completed = ?2", &[info_hash.to_string(), completed.to_string()]) {
match conn.execute("INSERT INTO torrents (info_hash, completed) VALUES (?1, ?2) ON CONFLICT(info_hash) DO UPDATE SET completed = ?2", [info_hash.to_string(), completed.to_string()]) {
Ok(updated) => {
if updated > 0 { return Ok(()); }
Err(database::Error::QueryReturnedNoRows)
Expand Down Expand Up @@ -144,7 +143,7 @@ impl Database for SqliteDatabase {
async fn add_info_hash_to_whitelist(&self, info_hash: InfoHash) -> Result<usize, database::Error> {
let conn = self.pool.get().map_err(|_| database::Error::DatabaseError)?;

match conn.execute("INSERT INTO whitelist (info_hash) VALUES (?)", &[info_hash.to_string()]) {
match conn.execute("INSERT INTO whitelist (info_hash) VALUES (?)", [info_hash.to_string()]) {
Ok(updated) => {
if updated > 0 { return Ok(updated); }
Err(database::Error::QueryReturnedNoRows)
Expand All @@ -159,7 +158,7 @@ impl Database for SqliteDatabase {
async fn remove_info_hash_from_whitelist(&self, info_hash: InfoHash) -> Result<usize, database::Error> {
let conn = self.pool.get().map_err(|_| database::Error::DatabaseError)?;

match conn.execute("DELETE FROM whitelist WHERE info_hash = ?", &[info_hash.to_string()]) {
match conn.execute("DELETE FROM whitelist WHERE info_hash = ?", [info_hash.to_string()]) {
Ok(updated) => {
if updated > 0 { return Ok(updated); }
Err(database::Error::QueryReturnedNoRows)
Expand All @@ -175,7 +174,7 @@ impl Database for SqliteDatabase {
let conn = self.pool.get().map_err(|_| database::Error::DatabaseError)?;

let mut stmt = conn.prepare("SELECT key, valid_until FROM keys WHERE key = ?")?;
let mut rows = stmt.query(&[key.to_string()])?;
let mut rows = stmt.query([key.to_string()])?;

if let Some(row) = rows.next()? {
let key: String = row.get(0).unwrap();
Expand All @@ -194,7 +193,7 @@ impl Database for SqliteDatabase {
let conn = self.pool.get().map_err(|_| database::Error::DatabaseError)?;

match conn.execute("INSERT INTO keys (key, valid_until) VALUES (?1, ?2)",
&[auth_key.key.to_string(), auth_key.valid_until.unwrap().to_string()],
[auth_key.key.to_string(), auth_key.valid_until.unwrap().to_string()],
) {
Ok(updated) => {
if updated > 0 { return Ok(updated); }
Expand Down