row is updated when a new scan is readed, and add two new list to navigate through the chapters of a scan

Author: yosholo

Easylast.cpp

@@ -73,31 +73,21 @@ string Easylast::find_summary(const string name,const int & chap)
     return ret;
 
 }
-vector<string> Easylast::list_pages_scan(const string & path)
-{
-    vector<dirent *> list_file;
-    vector<string> list_name_img;
-    
-    list_file = list_dir(path);
-
-    for(vector<dirent *>::iterator i=list_file.begin();i!=list_file.end();++i)
-	list_name_img.push_back((*i)->d_name);
-
-    return list_name_img;
-}
-
 
-vector<dirent *> Easylast::list_dir( const string &  path)
+vector<string> Easylast::list_dir( const string &  path)
 {
-    vector<dirent *> list_dir_scan;
+    vector<string> list_dir_scan;
     DIR* d = opendir(path.c_str());
     struct dirent *ent = NULL;
 
     while ((ent = readdir(d)) != NULL)
     {
         if (strcmp(ent->d_name, ".") != 0 && 
             strcmp(ent->d_name, "..") != 0) 
-	    list_dir_scan.push_back(ent);
+	{
+//	    cout << ent->d_name << endl;
+	    list_dir_scan.push_back(ent->d_name);
+	}
     }
 
     return list_dir_scan;
@@ -130,3 +120,8 @@ int Easylast::stoi(const string & i)
 {
     return atoi(i.c_str());
 }
+
+int Easylast::qstoi(const QString & i)
+{
+    return atoi(i.toStdString().c_str());
+}

Easylast.h

@@ -24,12 +24,12 @@ static vector<string> split(const string & msg,const string str_sep);
 static map<string,string> parse_info(const string & type);
 static string find_summary(const string name,const int & chap);
 
-static vector<dirent *> list_dir( const string & path);
-static vector<string> list_pages_scan(const string & path);
+static vector<string> list_dir( const string & path);
 static bool is_dir(string path);
 
 static string itos(const int & i);
 static int stoi(const string & i);
+static int qstoi(const QString & i);
 static QString stoqs(const string & s);
 static QString itoqs(const int & i);
 

Marco.cpp

@@ -3,22 +3,17 @@
 
 Marco::Marco(QWidget *parent)
 {
-/* Faire un constructeur vide pour le viewer */
 
     QHBoxLayout *layout_main = new QHBoxLayout;
     QVBoxLayout *layout_infos = new QVBoxLayout;
-    QHBoxLayout *layout_radio = new QHBoxLayout;
+    
     QList<QString> header ;
 
     sum_manga = new QSummaryManga;
     sum_show = new QSummaryShow;
 
-    button_circular = new QRadioButton("Circular");
-    button_normal = new QRadioButton("Normal");
-    
-    header << "Name" << "Next" << "Status";
+    header << "Name" << "Last" << "Next";
 
-    button_normal->setChecked(true);
     table_infos_scans = new QTableWidget(0,3);
     table_infos_shows = new QTableWidget(0,3);       
 
@@ -61,12 +56,9 @@ Marco::Marco(QWidget *parent)
 
     fill_table(infos_vu);
 
-    layout_radio->addWidget(button_normal);
-    layout_radio->addWidget(button_circular);
-    layout_radio->addStretch(1);
     layout_infos->addWidget(table_infos_shows,1);
     layout_infos->addWidget(table_infos_scans,1);
-    layout_infos->addItem(layout_radio);
+   
     layout_infos->addWidget(sum_manga);
 
     layout_main->addLayout(layout_infos);
@@ -86,6 +78,7 @@ void Marco::fill_table(map<string,string> infos)
     {
 	name = i->first;
 	info = i->second;
+
 	if(info[0] == 'S')
 	{
 	    table_infos_shows->insertRow(c_show);
@@ -97,48 +90,47 @@ void Marco::fill_table(map<string,string> infos)
 	{
 	    table_infos_scans->insertRow(c_scan);
 	    table_infos_scans->setItem(c_scan,0,new QTableWidgetItem(Easylast::stoqs(name)));
-	    table_infos_scans->setItem(c_scan,1,new QTableWidgetItem(Easylast::itoqs(atoi(info.c_str())+1)));
 
-	    if(Easylast::stoi(info)+1 <= Easylast::stoi(infos_dl[name]))
-		table_infos_scans->setItem(c_scan,2,new QTableWidgetItem("Ready"));
-	    else
-		table_infos_scans->setItem(c_scan,2,new QTableWidgetItem("Not Ready"));
+	    set_row_scan(c_scan,name,Easylast::stoi(info));
 	    c_scan++;
 	}
-    }
-	
+    }	
+}
+
+void Marco::set_row_scan(int row,string name_scan,int num_scan)
+{
+    table_infos_scans->setItem(row,1,new QTableWidgetItem(Easylast::itoqs(num_scan)));
+    
+    if(num_scan+1 <= Easylast::stoi(infos_dl[name_scan]))
+	table_infos_scans->setItem(row,2,new QTableWidgetItem(Easylast::itoqs(num_scan+1)+" Ready"));
+    else
+	table_infos_scans->setItem(row,2,new QTableWidgetItem(Easylast::itoqs(num_scan+1)+" Not Ready"));
 }
 
 void Marco::set_new_scan(string scan_cur,int num_cur)
 {
     string cmd = "client_last --VU --inc -t "+scan_cur;
     int row_count = table_infos_scans->rowCount();
-    system(cmd.c_str());
-    
+              
     sum_manga->setName(scan_cur);
     sum_manga->setChap(num_cur);
 
     summary = sum_manga;
 
-    if(button_normal->isChecked())
+    if(num_cur > Easylast::stoi(infos_vu[scan_cur]))
     {
-	if(num_cur < Easylast::stoi(infos_dl[scan_cur]))
-	    viewer->setScan(scan_cur,num_cur+1);
-	else
-	{
-	    int curr_row = table_infos_scans->currentRow();
-	    if(curr_row < row_count)
-	    {
-		string new_name = table_infos_scans->item(curr_row+1,0)->text().toStdString();
-		int new_num = Easylast::stoi(table_infos_scans->item(curr_row+1,1)->text().toStdString());
-		table_infos_scans->setCurrentCell(curr_row+1,0);
-		viewer->setScan(new_name,new_num);
-	    }
-	}
+	for(int i = 0;i<table_infos_scans->rowCount();i++)
+	    
+	    if(table_infos_scans->item(i,0)->text().toStdString() == scan_cur)
+		set_row_scan(i,scan_cur,num_cur);
+
+        system(cmd.c_str());
     }
-    
-    if(button_circular->isChecked())
-    {
+
+    if(num_cur < Easylast::stoi(infos_dl[scan_cur]))	
+	viewer->setScan(scan_cur,num_cur+1);
+    else
+    {	   
 	int curr_row = table_infos_scans->currentRow();
 	if(curr_row < row_count)
 	{
@@ -148,6 +140,8 @@ void Marco::set_new_scan(string scan_cur,int num_cur)
 	    viewer->setScan(new_name,new_num);
 	}
     }
+  
+    
 
 
 }

Marco.h

@@ -11,7 +11,6 @@
 #include <QList>
 #include <QHeaderView>
 #include <QAbstractItemView>
-#include <QRadioButton>
 #include <map>
 #include "QSummary.h"
 #include "QSummaryManga.h"
@@ -31,7 +30,6 @@ Q_OBJECT
 public:
 Marco(QWidget *parent = 0);
 
-
 protected slots:
 
 void set_new_scan(string scan_cur,int num_cur);
@@ -44,8 +42,6 @@ void double_clicked_scans(int row,int column);
 map<string,string> infos_vu;
 map<string,string> infos_dl;
 
-QRadioButton *button_circular;
-QRadioButton *button_normal;
 QTableWidget *table_infos_scans;
 QTableWidget *table_infos_shows;
 Qtviewer *viewer;
@@ -54,6 +50,7 @@ QSummaryManga *sum_manga;
 QSummaryShow *sum_show;
 
 void fill_table(map<string,string> infos);
+void set_row_scan(int row,string name_scan,int num_scan);
 };
 
 #endif

QSummaryManga.cpp

@@ -77,7 +77,7 @@ QVBoxLayout* QSummaryManga::createLayoutScan()
 void QSummaryManga::find_summary()
 {
     string summ = Easylast::find_summary(lscan->text().toStdString(),atoi(lchap->text().toStdString().c_str()));
-
+    cout << summ <<endl;
     lsummary->setText(Easylast::stoqs(summ));
 
 }
@@ -93,10 +93,12 @@ void QSummaryManga::add_summary()
     {
 	if( isNumber(textChap))
 	{
+	    cout << textSumm<<endl;
 	    if(Easylast::find_summary(textScan,atoi(textChap.c_str())) == "" )
 		cmd = "client_last --as -t \""+textScan+"\" -n "+textChap+" -s \""+textSumm+"\"";
 	    else
 		cmd = "client_last --us -t \""+textScan+"\" -n "+textChap+" -s \""+textSumm+"\"";
+	    
 
 	    if(system(cmd.c_str()) == 0)
 	    {