Add provider function to get job for class

classjob.go

@@ -9,7 +9,7 @@ import (
 	"github.com/xivapi/godestone/v2/internal/selectors"
 )
 
-var nonDigits = regexp.MustCompile("[^\\d]")
+var nonDigits = regexp.MustCompile(`[^\d]`)
 
 func (s *Scraper) buildClassJobCollector(charData *Character) *colly.Collector {
 	c := colly.NewCollector(
@@ -96,21 +96,37 @@ func (s *Scraper) buildClassJobCollector(charData *Character) *colly.Collector {
 
 			curCj.IsSpecialized = strings.Contains(e.Attr("class"), "meister")
 
-			jobInfo, err := s.dataProvider.ClassJob(names[0])
-			if err == nil {
-				curCj.JobID = uint8(jobInfo.ID)
-			}
-
 			if len(names) > 1 {
+				// "Job / Class"
+				jobInfo, err := s.dataProvider.ClassJob(names[0])
+				if err == nil {
+					curCj.JobID = uint8(jobInfo.ID)
+				}
+
 				classInfo, err := s.dataProvider.ClassJob(names[1])
 				if err == nil {
 					curCj.ClassID = uint8(classInfo.ID)
 				}
 			} else {
-				curCj.ClassID = uint8(curCj.JobID)
+				// "Job" or "Class"
+				cjInfo1, err := s.dataProvider.ClassJob(names[0])
+				if err == nil {
+					curCj.ClassID = uint8(cjInfo1.Parent) // Get the class (or job if there's no class)
+				}
+
+				if cjInfo1.JobIndex != 0 {
+					// This is already the job
+					curCj.JobID = uint8(cjInfo1.ID)
+				} else {
+					// This is a class; get the corresponding job
+					cjInfo2, err := s.dataProvider.JobForClass(names[0])
+					if err == nil {
+						curCj.JobID = uint8(cjInfo2.ID)
+					}
+				}
 			}
 
-			cjInfo, err := s.dataProvider.ClassJob(curCj.UnlockedState.Name)
+			cjInfo, err := s.dataProvider.ClassJob(names[0])
 			if err == nil {
 				curCj.UnlockedState.ID = uint8(cjInfo.ID)
 			}

provider/data-provider.go

@@ -9,7 +9,10 @@ type DataProvider interface {
 	Achievement(name string) (*models.NamedEntity, error)
 
 	// ClassJob returns expanded game data for the ClassJob with the specified name.
-	ClassJob(name string) (*models.NamedEntity, error)
+	ClassJob(name string) (*models.ClassJobInternal, error)
+
+	// JobForClass returns the job associated with the specified class name.
+	JobForClass(name string) (*models.ClassJobInternal, error)
 
 	// Deity returns expanded game data for the deity with the specified name.
 	Deity(name string) (*models.NamedEntity, error)

provider/models/records.go

@@ -32,3 +32,11 @@ type TitleInternal struct {
 
 	Prefix bool
 }
+
+// ClassJobInternal represents a ClassJob entry.
+type ClassJobInternal struct {
+	*NamedEntity
+
+	Parent   uint32
+	JobIndex uint32
+}