aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock2
-rw-r--r--Cargo.toml2
-rw-r--r--import/Cargo.toml (renamed from tools/Cargo.toml)6
-rw-r--r--import/src/main.rs (renamed from tools/src/bin/import.rs)4
-rw-r--r--import/src/tmdb.rs (renamed from tools/src/tmdb.rs)0
-rw-r--r--tools/src/lib.rs6
6 files changed, 6 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 00a0a27..afaa45e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1284,7 +1284,7 @@ dependencies = [
]
[[package]]
-name = "jellytools"
+name = "jellything-import"
version = "0.1.0"
dependencies = [
"anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 1e73144..2744873 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = [
"server",
"remuxer",
"common",
- "tools",
+ "import",
"matroska",
"ebml_derive",
"client",
diff --git a/tools/Cargo.toml b/import/Cargo.toml
index 63cb8b6..4e351c6 100644
--- a/tools/Cargo.toml
+++ b/import/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "jellytools"
+name = "jellything-import"
version = "0.1.0"
edition = "2021"
@@ -17,7 +17,3 @@ reqwest = { version = "0.11.18", features = ["blocking", "json"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
bincode = { version = "2.0.0-rc.3", features = ["serde"] }
-
-[[bin]]
-path = "src/bin/import.rs"
-name = "jellything-import"
diff --git a/tools/src/bin/import.rs b/import/src/main.rs
index eada6ad..6cf2ef3 100644
--- a/tools/src/bin/import.rs
+++ b/import/src/main.rs
@@ -3,12 +3,13 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2023 metamuffin <metamuffin.org>
*/
+pub mod tmdb;
+
use anyhow::Context;
use clap::{Parser, Subcommand};
use jellycommon::{AssetLocation, MediaInfo, MediaSource, Node, NodeKind, NodePrivate, NodePublic};
use jellymatroska::read::EbmlReader;
use jellyremuxer::import::{import_metadata, seek_index::import_seek_index};
-use jellytools::tmdb::{tmdb_details, tmdb_image, tmdb_search};
use log::info;
use std::{
collections::BTreeMap,
@@ -17,6 +18,7 @@ use std::{
path::PathBuf,
process::exit,
};
+use tmdb::{tmdb_details, tmdb_image, tmdb_search};
#[derive(Parser)]
struct Args {
diff --git a/tools/src/tmdb.rs b/import/src/tmdb.rs
index 5f21afd..5f21afd 100644
--- a/tools/src/tmdb.rs
+++ b/import/src/tmdb.rs
diff --git a/tools/src/lib.rs b/tools/src/lib.rs
deleted file mode 100644
index c5dca31..0000000
--- a/tools/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- This file is part of jellything (https://codeberg.org/metamuffin/jellything)
- which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
- Copyright (C) 2023 metamuffin <metamuffin.org>
-*/
-pub mod tmdb;