Added support for WotLK

.github/workflows/main.yml

@@ -7,7 +7,7 @@ name: Create Catalog
 
 jobs:
   fetch:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Fetch addon data
     steps:
       - uses: actions/checkout@v2
@@ -32,9 +32,9 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email [email protected]
-          git add catalog-0.2.0.json
+          git add catalog-0.3.0.json
           git commit -m "chore: updated catalog"
           git push
       - name: Test
         run: |
-          jq '. | length' ./catalog-0.2.0.json
+          jq '. | length' ./catalog-0.3.0.json

.gitignore

@@ -1 +1,2 @@
+.idea/
 /target

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "catalog"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Casper Rogild Storm"]
 edition = "2018"
 

README.md

@@ -3,7 +3,7 @@
 This repository generates a JSON file which is used in [Ajour](https://github.com/ajour/ajour/).
 The JSON file contains all available addons from:
 
-- Curse
+- Curse (temporary disabled)
 - Tukui
 - WowInterface
 - Hub

build.rs

@@ -0,0 +1,12 @@
+fn main() {
+    let target_os = std::env::var("CARGO_CFG_TARGET_OS");
+    match target_os.as_ref().map(|x| &**x) {
+        Ok("macos") => {
+            print!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.11")
+        }
+        Ok("windows") | Ok("linux") => {
+            // noop
+        }
+        tos => panic!("unknown target os {:?}!", tos),
+    }
+}

crates/core/src/backend/mod.rs

@@ -54,6 +54,8 @@ pub enum Flavor {
         alias = "burning_crusade"
     )]
     ClassicTbc,
+    #[serde(alias = "wotlk")]
+    ClassicWotlk,
     ClassicPtr,
     ClassicBeta,
 }
@@ -69,6 +71,7 @@ impl std::fmt::Display for Flavor {
                 Flavor::RetailBeta => "retail_beta",
                 Flavor::ClassicEra => "classic_era",
                 Flavor::ClassicTbc => "classic_tbc",
+                Flavor::ClassicWotlk => "classic_wotlk",
                 Flavor::ClassicBeta => "classic_beta",
                 Flavor::ClassicPtr => "classic_ptr",
             }
@@ -81,7 +84,8 @@ impl Flavor {
     pub fn base_flavor(self) -> Flavor {
         match self {
             Flavor::Retail | Flavor::RetailPtr | Flavor::RetailBeta => Flavor::Retail,
-            Flavor::ClassicTbc | Flavor::ClassicPtr | Flavor::ClassicBeta => Flavor::ClassicTbc,
+            Flavor::ClassicWotlk | Flavor::ClassicPtr | Flavor::ClassicBeta => Flavor::ClassicWotlk,
+            Flavor::ClassicTbc => Flavor::ClassicTbc,
             Flavor::ClassicEra => Flavor::ClassicEra,
         }
     }

crates/core/src/backend/tukui.rs

@@ -70,6 +70,9 @@ fn endpoint_for_addons(flavor: &Flavor) -> String {
         Flavor::ClassicTbc => {
             format!("{}?classic-tbc-addons=all", base_endpoint)
         }
+        Flavor::ClassicWotlk => {
+            format!("{}?classic-wotlk-addons=all", base_endpoint)
+        }
         _ => panic!("Unknown base flavor {}", flavor),
     }
 }
@@ -83,7 +86,12 @@ fn endpoint_for_elvui() -> String {
 }
 
 pub async fn get_addons() -> Result<Vec<Addon>, Error> {
-    let flavors = vec![Flavor::Retail, Flavor::ClassicEra, Flavor::ClassicTbc];
+    let flavors = vec![
+        Flavor::Retail,
+        Flavor::ClassicEra,
+        Flavor::ClassicTbc,
+        Flavor::ClassicWotlk,
+    ];
     let mut addons: Vec<Addon> = vec![];
     for flavor in flavors.iter() {
         match flavor.base_flavor() {

crates/core/src/backend/wowinterface.rs

@@ -58,6 +58,7 @@ fn flavor_for_category_id(id: i32) -> Flavor {
     match id {
         160 => Flavor::ClassicEra,
         161 => Flavor::ClassicTbc,
+        162 => Flavor::ClassicWotlk,
         _ => Flavor::Retail,
     }
 }
@@ -73,6 +74,8 @@ fn guess_flavor_from_version(version: &str) -> Option<Flavor> {
         Some('1') => Some(Flavor::ClassicEra),
         // 2.x.x
         Some('2') => Some(Flavor::ClassicTbc),
+        // 3.x.x
+        Some('3') => Some(Flavor::ClassicWotlk),
         _ => None,
     }
 }

src/main.rs

@@ -1,8 +1,9 @@
 use core::{
-    backend::{Backend, Source::*},
+    backend::{Addon, Backend, Source::*},
     error::Error,
 };
-use futures::{executor::block_on, try_join};
+use futures::executor::block_on;
+use futures::future::join_all;
 use std::fs::File;
 use std::io::Write;
 use structopt::StructOpt;
@@ -19,16 +20,23 @@ async fn handle_opts() -> Result<(), Error> {
     match opts.command {
         // Generate a JSON file with all backend sources combined.
         Command::Catalog => {
-            let (tukui, wowi, curse, hub) = try_join!(
-                Tukui.get_addons(),
-                WowI.get_addons(),
-                Curse.get_addons(),
-                Hub.get_addons()
-            )?;
-            // Combine all addons.
-            let concatenated = [&tukui[..], &wowi[..], &curse[..], &hub[..]].concat();
+            let addons: Vec<Addon> = join_all(
+                vec![
+                    // Curse, // Disabled. Not working
+                    // Tukui, // Disabled. Not working
+                    WowI,
+                    Hub,
+                ]
+                .iter()
+                .map(|x| x.get_addons()),
+            )
+            .await
+            .into_iter()
+            .map(|x| x.unwrap())
+            .flatten()
+            .collect();
             // Serialize.
-            let json = serde_json::to_string(&concatenated)?;
+            let json = serde_json::to_string(&addons)?;
             // Create catalog file.
             let file_name = format!("catalog-{}.json", VERSION.expect("no version was found"));
             let mut file = File::create(file_name)?;