Add Shtab syncing support by side2k · Pull Request #1 · side2k/ham-cli

side2k · 2024-11-13T21:11:54Z

Syncing with shtab.app

…tion

qrilka

замечания неприниципальные, но я смотрел только PR возможно имеет смысл посмотреть всю тулзу с т.зр. какой перестройки (типа чтение из хамстера один раз)

qrilka · 2024-11-14T06:13:11Z

src/enrichment.rs

+            let mut task_id: Option<String> = None;
+            for extractor in extractors.into_iter() {
+                task_id = extractor(link.url.as_str());
+                if task_id != None {
+                    break;
+                }
+            }


Suggested change

let mut task_id: Option<String> = None;

for extractor in extractors.into_iter() {

task_id = extractor(link.url.as_str());

if task_id != None {

break;

}

}

let task_id = extractors.into_iter().find_map(|extractor|extractor(link.url.as_str()));

Спасибо, не знал про find_map()!

qrilka · 2024-11-14T06:22:09Z

src/enrichment.rs

        if links.is_empty() {
            None
        } else {
            let link = links[0];


Suggested change

if links.is_empty() {

None

} else {

let link = links[0];

let link = links.get(0)?;

Поправил, спасибо

qrilka · 2024-11-14T06:31:01Z

src/main.rs

+    run_mode: RunMode,
+) {
+    let client = ShtabClient::new(Some(api_token));
+    let me = client.get_profile().await.unwrap();


вместо unwrap яб возвращал anyhow::Result<()> и использовал ? - чуть сделает код короче

qrilka · 2024-11-14T06:35:08Z

src/main.rs

+    let activity_id:i64 = match activity_id {
+        Some(activity_id) => activity_id,
+        None => match std::env::var("HAMCLI_SHTAB_ACTIVITY") {
+            Ok(activity_id_str) => activity_id_str.parse::<i64>().unwrap(),
+            Err(_) => panic!(
+                "Please specify activity id via --activity-id option or HAMCLI_SHTAB_ACTIVITY env var")
+        }
+    };


Suggested change

let activity_id:i64 = match activity_id {

Some(activity_id) => activity_id,

None => match std::env::var("HAMCLI_SHTAB_ACTIVITY") {

Ok(activity_id_str) => activity_id_str.parse::<i64>().unwrap(),

Err(_) => panic!(

"Please specify activity id via --activity-id option or HAMCLI_SHTAB_ACTIVITY env var")

}

};

let Some(activity_id:i64) = activity_id.or(std::env::var("HAMCLI_SHTAB_ACTIVITY")).and_then(|id| id.parse<i64>().ok()) else {

panic!(

"Please specify activity id via --activity-id option or HAMCLI_SHTAB_ACTIVITY env var")

};

код не проверял

О, спасибо, что заметил. Я здесь решил немного иначе сделать(см. 56954e2) - в cli::Commands этот параметр не является опциональным (я делал немножко на будущее, но в итоге раздумал - когда прикручу функционал получения этого айдишника, тогда и сделаю опциональным).

qrilka · 2024-11-14T09:12:26Z

src/main.rs

+    let local_tz = Local::now().timezone();
+
+    let mut day = from;
+    while day <= to {


жалька что по ходу нельзя сделать

for day in (from..=to)

qrilka · 2024-11-14T09:18:52Z

src/main.rs

+    while day <= to {
+        println!("Processing day {}", day);
+        let next_day = day.checked_add_days(Days::new(1)).unwrap();
+        let tasks = get_tasks_with_durations(hamster_db.clone(), day, next_day, category.clone());


а зачем каждый раз открывать файл? один раз в память считать и брать оттуда не проще?

Резонно. Подумаю над рефакторингом.

qrilka · 2024-11-14T09:24:38Z

src/main.rs

+            let task_id: i64 = match task_id {
+                Some(task_id) => task_id.parse::<i64>().unwrap(),
+                None => match run_mode {
+                    RunMode::DryRun => -1,
+                    RunMode::Normal => panic!(
+                        "Missing task id! ({}, '{}')",
+                        task_data.duration.as_hhmm(),
+                        task_data.title.unwrap_or("-".to_string())
+                    ),
+                },
+            };


Suggested change

let task_id: i64 = match task_id {

Some(task_id) => task_id.parse::<i64>().unwrap(),

None => match run_mode {

RunMode::DryRun => -1,

RunMode::Normal => panic!(

"Missing task id! ({}, '{}')",

task_data.duration.as_hhmm(),

task_data.title.unwrap_or("-".to_string())

),

},

};

let Some(task_id: i64) = task_id.map(|id|id.parse::<i64>().unwrap()).or( (run_mode==RunMode::DryRun).then_some(-1)) else {

panic!(

"Missing task id! ({}, '{}')",

task_data.duration.as_hhmm(),

task_data.title.unwrap_or("-".to_string())

),

};

покороче, но не 100% понятней, конечно

qrilka · 2024-11-14T09:25:41Z

src/main.rs

+            );
+
+            match &run_mode {
+                RunMode::DryRun => println!("would add new  record - {data_msg}"),


Suggested change

RunMode::DryRun => println!("would add new record - {data_msg}"),

RunMode::DryRun => println!("would add new record - {data_msg}"),

или

Suggested change

RunMode::DryRun => println!("would add new record - {data_msg}"),

RunMode::DryRun => println!("would add new a record - {data_msg}"),

qrilka · 2024-11-14T09:25:43Z

src/main.rs

+            );
+
+            match &run_mode {
+                RunMode::DryRun => println!("would add new  record - {data_msg}"),


Suggested change

RunMode::DryRun => println!("would add new record - {data_msg}"),

RunMode::DryRun => println!("would add new record - {data_msg}"),

или

Suggested change

RunMode::DryRun => println!("would add new record - {data_msg}"),

RunMode::DryRun => println!("would add new a record - {data_msg}"),

Leonid Amirov added 6 commits November 13, 2024 23:03

feat(enrichment): HamsterEnrichedData: implement Shtab task ID extrac…

4dce9ac

…tion

feat(deps): add shtab-simple-client

020e0de

feat(deps): remove ref lock for everhour-simple-client

17f3272

chore(deps): update lockfile

0ccc1c6

feat: implement first iteration of sync-sh command

35c7647

doc: add WIP notes on Shtab sync

fabb4ff

qrilka approved these changes Nov 14, 2024

View reviewed changes

Leonid Amirov added 3 commits November 27, 2024 00:40

refactor(enrichment): minor optimizations

aaf4161

refactor(cli): do not convert activity_id to Option and back

56954e2

fix(main): sync_tasks_to_shtab: message string

0792dcc

	RunMode::DryRun => println!("would add new record - {data_msg}"),
	RunMode::DryRun => println!("would add new record - {data_msg}"),

Conversation

side2k commented Nov 13, 2024

Uh oh!

qrilka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

side2k Nov 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

side2k Nov 26, 2024 •

edited

Loading