pleshevskiy/tas
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: pleshevskiy:uuid
Branches Tags
pleshevskiy:main
pleshevskiy:uuid
pleshevskiy:sqlite
..
compare: pleshevskiy:main
Branches Tags
pleshevskiy:main
pleshevskiy:uuid
pleshevskiy:sqlite

1 commit
uuid ... main

Author SHA1 Message Date
janabhumi
8b648f422e
nix: remove naersk 2022-09-06 00:06:54 +03:00
10 changed files with 33 additions and 146 deletions
Show stats Expand all files Collapse all files

1
.envrc Normal file
View file

@ -0,0 +1 @@
use flake

2
.gitignore vendored
View file

@ -1 +1,3 @@
/target
.direnv/

17
Cargo.lock generated
View file

@ -284,15 +284,8 @@ dependencies = [
"libsqlite3-sys",
"smallvec",
"time",
"uuid",
]
[[package]]
name = "sha1_smol"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
[[package]]
name = "smallvec"
version = "1.9.0"
@ -318,7 +311,6 @@ dependencies = [
"log",
"rusqlite",
"time",
"uuid",
"xdg",
]
@ -372,15 +364,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
[[package]]
name = "uuid"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
dependencies = [
"sha1_smol",
]
[[package]]
name = "vcpkg"
version = "0.2.15"

3
Cargo.toml
View file

@ -13,9 +13,8 @@ maintenance = { status = "experimental" }
[dependencies]
clap = { version = "3.2.16", default-features = false, features = ["derive", "std"] }
log = "0.4.17"
rusqlite = { version = "0.28.0", features = ["bundled", "time", "uuid"] }
rusqlite = { version = "0.28.0", features = ["bundled", "time"] }
time = "0.3"
uuid = { version = "1.1.2", features = ["v5"] }
xdg = "2.4.1"

2
database/migrations/202208211624.sql
View file

@ -1,2 +0,0 @@
ALTER TABLE tasks
ADD COLUMN uuid BLOB;

1
database/schema.sql
View file

@ -8,7 +8,6 @@ CREATE TABLE tasks (
project TEXT ,
link TEXT ,
dir_path TEXT ,
uuid BLOB ,
current BOOLEAN NOT NULL DEFAULT false,

36
flake.lock
View file

@ -1,39 +1,6 @@
{
"nodes": {
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1659610603,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"owner": "nix-community",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1661008273,
"narHash": "sha256-UpDqsGzUswIHG7FwzeIewjWlElF17UVLNbI2pwlbcBY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cc6444e74cd21e8da8d81ef4cd778492e10f843",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1661008273,
"narHash": "sha256-UpDqsGzUswIHG7FwzeIewjWlElF17UVLNbI2pwlbcBY=",
@ -51,8 +18,7 @@
},
"root": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"utils": "utils"
}
},

37
flake.nix
View file

@ -1,45 +1,30 @@
{
inputs = {
naersk.url = "github:nix-community/naersk/master";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, utils, naersk }:
outputs = { self, nixpkgs, utils }:
utils.lib.eachDefaultSystem (system:
let
name = "tas";
pkgs = import nixpkgs { inherit system; };
naersk-lib = pkgs.callPackage naersk { };
cargoToml = with builtins; (fromTOML (readFile ./Cargo.toml));
in
rec {
# Executes by `nix build .#<name>`
packages = {
${name} = naersk.lib.${system}.buildPackage {
pname = name;
root = ./.;
packages.default = pkgs.rustPlatform.buildRustPackage {
inherit (cargoToml.package) name version;
src = nixpkgs.lib.cleanSource ./.;
doCheck = true;
cargoLock.lockFile = ./Cargo.lock;
};
};
# Executes by `nix build .`
packages.default = packages.${name};
# the same but deprecated in Nix 2.7
defaultPackage = packages.default;
# Executes by `nix run .#<name> -- <args?>`
apps = {
${name} = utils.lib.mkApp {
inherit name;
drv = packages.${name};
apps.default = utils.lib.mkApp {
inherit (cargoToml.package) name;
drv = packages.default;
};
};
# Executes by `nix run . -- <args?>`
apps.default = apps.${name};
# the same but deprecated in Nix 2.7
defaultApp = apps.default;
# Used by `nix develop`
devShell = with pkgs; mkShell {
buildInputs = [ cargo rustc rustfmt rustPackages.clippy ];
packages = [ cargo rustc rustfmt clippy rust-analyzer ];
RUST_SRC_PATH = rustPlatform.rustLibSrc;
};
});

2
src/repo.rs
View file

@ -64,7 +64,7 @@ pub struct UpdateTaskData {
}
pub trait Repository {
fn get_current_task_opt(&self) -> Result<Option<domain::Task>, Error>;
fn get_current_task_opt(&self) -> Result<Option<domain::CurrentTaskInfo>, Error>;
fn get_task_opt(&self, id: domain::TaskIdx) -> Result<Option<domain::Task>, Error>;

78
src/repo/sqlite.rs
View file

@ -1,7 +1,6 @@
use std::path::PathBuf;
use rusqlite::{Connection, OptionalExtension};
use uuid::Uuid;
use xdg::BaseDirectories;
use crate::domain;
@ -19,7 +18,7 @@ struct Task {
*/
created_at: time::OffsetDateTime,
uuid: uuid::Uuid,
idx: i64,
}
impl From<Task> for domain::Task {
@ -49,7 +48,7 @@ impl<'r> TryFrom<&'r rusqlite::Row<'_>> for Task {
finished_at: row.get("finished_at")?,
*/
created_at: row.get("created_at")?,
uuid: row.get("uuid")?,
idx: row.get("idx")?,
})
}
}
@ -70,10 +69,13 @@ impl SqliteRepo {
}
impl Repository for SqliteRepo {
fn get_current_task_opt(&self) -> Result<Option<domain::Task>, Error> {
fn get_current_task_opt(&self) -> Result<Option<domain::CurrentTaskInfo>, Error> {
let db_task = self.get_current_task_opt_impl()?;
Ok(db_task.map(|db_task| db_task.into()))
Ok(db_task.map(|db_task| domain::CurrentTaskInfo {
task_idx: db_task.idx as usize,
task: db_task.into(),
}))
}
fn get_task_opt(&self, id: domain::TaskIdx) -> Result<Option<domain::Task>, Error> {
@ -116,13 +118,11 @@ impl Repository for SqliteRepo {
}
fn insert_task(&self, insert_data: super::InsertTaskData) -> Result<domain::Task, Error> {
let created_at = time::OffsetDateTime::now_utc();
let mut stmt = self
.conn
.prepare(
"INSERT INTO tasks (name, project, link, dir_path, created_at)
VALUES (?1, ?2, ?3, ?4, ?5)",
"INSERT INTO tasks (name, project, link, dir_path)
VALUES (?1, ?2, ?3, ?4)",
)
.map_err(|_| Error::PrepareQuery)?;
@ -134,7 +134,6 @@ impl Repository for SqliteRepo {
&insert_data
.dir_path
.and_then(|p| p.into_os_string().into_string().ok()),
&created_at,
))
.map_err(|_| Error::InsertData)?;
@ -244,7 +243,7 @@ impl SqliteRepo {
fn get_current_task_opt_impl(&self) -> Result<Option<Task>, Error> {
let mut stmt = self
.conn
.prepare("SELECT * FROM active_tasks WHERE current")
.prepare("SELECT * FROM active_tasks WHERE current IS true")
.map_err(|_| Error::PrepareQuery)?;
let row = stmt
@ -258,14 +257,10 @@ impl SqliteRepo {
macro_rules! run_migration {
($this:ident, $ver:ident = $version:expr) => {
run_migration!(
$this,
$ver = $version,
file = concat!("migrations/", $version)
);
run_migration!($this, $ver = $version => concat!("migrations/", $version));
};
($this:ident, $ver:ident = $version:expr, file = $sql_name:expr) => {
($this:ident, $ver:ident = $version:expr => $sql_name:expr) => {
$this
.conn
.execute_batch(&format!(
@ -284,8 +279,6 @@ pub enum MigrationError {
Upgrade,
DeleteInfo,
InsertInfo,
StartTransaction,
Db(Error),
}
impl std::fmt::Display for MigrationError {
@ -298,14 +291,13 @@ impl std::fmt::Display for MigrationError {
MigrationError::InsertInfo => {
f.write_str("Cannot insert a new tas information to the database")
}
MigrationError::Db(inner) => write!(f, "Database error: {}", inner),
}
}
}
impl std::error::Error for MigrationError {}
const LATEST_VERSION: i64 = 202208211624;
const LATEST_VERSION: i64 = 202208201623;
impl SqliteRepo {
pub fn upgrade(&self) -> Result<(), MigrationError> {
@ -313,50 +305,12 @@ impl SqliteRepo {
match version {
Some(LATEST_VERSION) => return Ok(()),
None => {
run_migration!(self, version = LATEST_VERSION, file = "schema");
run_migration!(self, version = LATEST_VERSION => "schema");
}
_ => {
if version == Some(202208162308) {
Some(v) => {
if v == 202208162308 {
run_migration!(self, version = 202208201623);
}
if version == Some(202208201623) {
run_migration!(self, version = 202208211624);
let mut stmt = self
.conn
.prepare("SELECT id, created_at, project, name, link FROM tasks")
.map_err(|_| MigrationError::Db(Error::PrepareQuery))?;
let rows = stmt
.query_map([], |row| {
let id: i64 = row.get("id")?;
let created_at: time::OffsetDateTime = row.get("created_at")?;
let project: Option<String> = row.get("project")?;
let name: String = row.get("name")?;
let link: Option<String> = row.get("link")?;
let uuid = Uuid::new_v5(
&Uuid::NAMESPACE_OID,
format!(
"p:{},n:{},l:{},d:{}",
project.unwrap_or_default(),
name,
link.unwrap_or_default(),
created_at.unix_timestamp()
)
.as_bytes(),
);
Ok((id, uuid))
})
.map_err(|_| MigrationError::Db(Error::QueryData))?;
for row in rows {
let (id, uuid) = row.map_err(|_| MigrationError::Db(Error::InvalidData))?;
this.conn
.execute("UPDATE tasks SET uuid = ?2 WHERE id = ?1", (uuid, id))
.map_err(|_| MigrationError::Db(Error::UpdateData))?;
}
}
}
}