Merge branch '8-serial-key-format' into 'master'

Resolve "serial key format"

Closes #8

See merge request !5
This commit is contained in:
Sebastian Hugentobler 2017-03-23 14:27:26 +00:00
commit e396d2f006
5 changed files with 64 additions and 9 deletions

2
.vscode/launch.json vendored
View File

@ -5,7 +5,7 @@
"name": "Debug", "name": "Debug",
"type": "lldb-mi", "type": "lldb-mi",
"request": "launch", "request": "launch",
"target": "./target/debug/gog-backup", "target": "./target/debug/gog-sync",
"cwd": "${workspaceRoot}" "cwd": "${workspaceRoot}"
} }
] ]

View File

@ -1,3 +1,6 @@
## 0.2.3 (2017-03-23)
- correctly parse serial keys (closes #8)
## 0.2.2 (2017-03-22) ## 0.2.2 (2017-03-22)
- ability to filter movies by resolution - ability to filter movies by resolution
- ability to save movies seperately - ability to save movies seperately

6
Cargo.lock generated
View File

@ -3,7 +3,7 @@ name = "gog-sync"
version = "0.2.2" version = "0.2.2"
dependencies = [ dependencies = [
"chrono 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.21.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -53,7 +53,7 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "2.21.2" version = "2.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -429,7 +429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159" "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
"checksum bitflags 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e1ab483fc81a8143faa7203c4a3c02888ebd1a782e37e41fa34753ba9a162" "checksum bitflags 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e1ab483fc81a8143faa7203c4a3c02888ebd1a782e37e41fa34753ba9a162"
"checksum chrono 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "158b0bd7d75cbb6bf9c25967a48a2e9f77da95876b858eadfabaa99cd069de6e" "checksum chrono 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "158b0bd7d75cbb6bf9c25967a48a2e9f77da95876b858eadfabaa99cd069de6e"
"checksum clap 2.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "58ad5e8142f3a5eab0c1cba5011aa383e009842936107fe4d94f1a8d380a1aec" "checksum clap 2.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "875f4f161166a71c4b7bf2c05f46d26c30d8b9052c16a6bdd3171ddf03848cbe"
"checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b" "checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b"
"checksum curl-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d909dc402ae80b6f7b0118c039203436061b9d9a3ca5d2c2546d93e0a61aaa" "checksum curl-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d909dc402ae80b6f7b0118c039203436061b9d9a3ca5d2c2546d93e0a61aaa"
"checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"

View File

@ -17,6 +17,7 @@ use models::{Token, Content, Data, Config};
use serde_json; use serde_json;
use serde_json::Value; use serde_json::Value;
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::BTreeMap;
use std::fmt; use std::fmt;
use std::fs; use std::fs;
use std::fs::File; use std::fs::File;
@ -133,7 +134,7 @@ impl<'a> Gog<'a> {
let mut config: Config = match configfiles.load("config.json") { let mut config: Config = match configfiles.load("config.json") {
Ok(value) => value, Ok(value) => value,
Err(_) => { Err(_) => {
error!("Configuration error, generating new one..."); error!("Configuration error, generating new one");
Config { Config {
game_storage: String::from(storage_path), game_storage: String::from(storage_path),
@ -189,10 +190,16 @@ impl<'a> Gog<'a> {
fs::create_dir_all(&content_root)?; fs::create_dir_all(&content_root)?;
if !content.cd_key.is_empty() { let key_root = content_root.join("keys");
let key_path = Path::new(content_root.as_os_str()).join("key.txt");
if content.cd_keys.len() > 0 {
fs::create_dir_all(&key_root)?;
}
for (key, value) in content.cd_keys {
let key_path = key_root.join(format!("{}.txt", key));
let mut key_file = File::create(&key_path)?; let mut key_file = File::create(&key_path)?;
key_file.write_all(content.cd_key.as_bytes())? key_file.write_all(value.as_bytes())?
} }
for data in content.data { for data in content.data {
@ -331,6 +338,43 @@ impl<'a> Gog<'a> {
return Ok(content_ids); return Ok(content_ids);
} }
fn parse_cd_keys(&self, content_title: &str, raw_cd_keys: &str) -> BTreeMap<String, String> {
let mut cd_keys = BTreeMap::new();
let mut raw_cd_keys_fix = raw_cd_keys.to_owned();
if raw_cd_keys_fix.contains("<span>") {
raw_cd_keys_fix = raw_cd_keys_fix.replace("</span><span>", "<br>")
.replace("<span>", "")
.replace("</span>", "");
}
if raw_cd_keys_fix.contains("<br>") {
let splitted_keys = raw_cd_keys_fix.split("<br>");
let mut key_names: Vec<String> = Vec::new();
let mut key_values: Vec<String> = Vec::new();
for (token_index, token) in splitted_keys.enumerate() {
if token_index % 2 == 0 {
let mut key_name = token.to_owned();
key_name.truncate(token.len() - 1);
key_names.push(key_name);
} else {
key_values.push(token.trim().to_owned());
}
}
for (index, key_name) in key_names.iter().enumerate() {
let key_value = key_values[index].clone();
cd_keys.insert(key_name.clone(), key_value);
}
} else if !raw_cd_keys_fix.is_empty() {
cd_keys.insert(content_title.to_owned(), raw_cd_keys_fix.trim().to_owned());
}
return cd_keys;
}
fn get_content(&mut self, fn get_content(&mut self,
content_id: u64, content_id: u64,
os_filters: &Vec<String>, os_filters: &Vec<String>,
@ -360,6 +404,11 @@ impl<'a> Gog<'a> {
content.is_movie = is_movie; content.is_movie = is_movie;
if content_raw.is_object() && content_raw.as_object().unwrap().contains_key("cdKey") {
let cd_keys_raw = content_raw["cdKey"].as_str().unwrap();
content.cd_keys = self.parse_cd_keys(&content.title, cd_keys_raw);
}
debug!("processing installer fields: {:?}", &downloads); debug!("processing installer fields: {:?}", &downloads);
for languages in downloads.as_array() { for languages in downloads.as_array() {
for language in languages { for language in languages {

View File

@ -1,6 +1,7 @@
use chrono::UTC; use chrono::UTC;
use std::fmt; use std::fmt;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::collections::BTreeMap;
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::hash_map::DefaultHasher; use std::collections::hash_map::DefaultHasher;
@ -84,7 +85,9 @@ impl Config {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Content { pub struct Content {
pub title: String, pub title: String,
pub cd_key: String, #[serde(skip_deserializing)]
#[serde(rename(deserialize = "cdKey"))]
pub cd_keys: BTreeMap<String, String>,
#[serde(skip_deserializing)] #[serde(skip_deserializing)]
pub is_movie: bool, pub is_movie: bool,
#[serde(skip_deserializing)] #[serde(skip_deserializing)]