block, kill process시 list 재수집

git-svn-id: svn://192.168.0.12/source@55 8346c931-da38-4b9b-9d4c-e48b93cbd075
This commit is contained in:
admin
2015-03-16 10:14:04 +00:00
parent a95853ed61
commit b9a8c64811
7 changed files with 59 additions and 7 deletions

View File

@@ -102,7 +102,7 @@ bool SDaumCafeManage::Update()
m_pro[0].kill();
}
}
if (m_nMode == E_PROCESS_LIST_FINISH_WAIT) return m_bFinalLast;
if (m_nMode == E_PROCESS_LIST_FINISH_WAIT){ReLoadList(); return m_bFinalLast;}
}
break;
}
@@ -119,9 +119,14 @@ void SDaumCafeManage::processFinished(QProcess *_pPro,QString _strOut)
if (_strOut.right(4) == "last" || m_ncList >= 1000)
m_bLast = true;
// if (_strOut.right(5) == "block")
// m_bFinalLast = true;
/*
if (_strOut.right(5) == "block")
m_bFinalLast = true;
{
ReLoadList();
}
*/
m_strListURL.clear();
foreach(QString str,_strOut.split("\n"))
{
@@ -134,6 +139,8 @@ void SDaumCafeManage::processFinished(QProcess *_pPro,QString _strOut)
{
m_nMode = E_PROCESS_LIST_RUN;
CheckLast();
if(m_bLast == false)
ReLoadList();
}
else
m_nMode = E_PROCESS_URL_RUN;
@@ -152,3 +159,11 @@ void SDaumCafeManage::processFinished(QProcess *_pPro,QString _strOut)
break;
}
}
void SDaumCafeManage::ReLoadList()
{
m_nMode = E_PROCESS_LIST_RUN;
m_ncList -= 1;
m_pMain->InsertLog("Reload List");
}

View File

@@ -22,6 +22,7 @@ protected:
bool Update();
void Start();
void processFinished(QProcess *pPro,QString _strOut);
void ReLoadList();
};
#endif // SNAVERCAFEMANAGE_H

View File

@@ -115,6 +115,7 @@ void SManage::CheckLast()
if (m_date > m_dateEnd)
{
m_bFinalLast = true;
m_pMain->InsertLog("Finish Crawling :)");
}
m_ncList=1;
}

View File

@@ -97,6 +97,14 @@ void SNaverBlogManage::processFinished(QProcess *pPro,QString _strOut)
m_bLast = false;
if (_strOut.right(4) == "last" || m_ncList >= 991)
m_bLast = true;
/*
if (_strOut.right(5) == "block")
{
ReLoadList();
}
*/
m_strListURL.clear();
foreach(QString str,_strOut.split("\n"))
{
@@ -109,6 +117,8 @@ void SNaverBlogManage::processFinished(QProcess *pPro,QString _strOut)
{
m_nMode = E_PROCESS_LIST_RUN;
CheckLast();
if(m_bLast == false)
ReLoadList();
}
else
m_nMode = E_PROCESS_URL_RUN;
@@ -182,7 +192,7 @@ bool SNaverBlogManage::Update()
m_pro[0].kill();
}
}
if (m_nMode == E_PROCESS_LIST_FINISH_WAIT) return m_bFinalLast;
if (m_nMode == E_PROCESS_LIST_FINISH_WAIT) {ReLoadList(); return m_bFinalLast;}
}
break;
}
@@ -299,3 +309,11 @@ void SNaverBlogManage::Join()
//m_pMain->InsertLog(m_nID,"Finish ... ");
m_pMain->InsertLog("Finish ... ");
}
void SNaverBlogManage::ReLoadList()
{
m_nMode = E_PROCESS_LIST_RUN;
m_ncList -= 10;
m_pMain->InsertLog("Reload List");
}

View File

@@ -34,6 +34,7 @@ protected:
bool Update();
void Start();
void processFinished(QProcess *pPro,QString _strOut);
void ReLoadList();
};
#endif // SNAVERBLOGMANAGE_H

View File

@@ -84,7 +84,7 @@ bool SNaverCafeManage::Update()
m_pro[0].kill();
}
}
if (m_nMode == E_PROCESS_LIST_FINISH_WAIT) return m_bFinalLast;
if (m_nMode == E_PROCESS_LIST_FINISH_WAIT) {ReLoadList(); return m_bFinalLast;}
}
break;
}
@@ -101,9 +101,15 @@ void SNaverCafeManage::processFinished(QProcess *_pPro,QString _strOut)
if (_strOut.right(4) == "last" || m_ncList >= 1000)
m_bLast = true;
if (_strOut.right(5) == "block")
m_bFinalLast = true;
// if (_strOut.right(5) == "block")
// //m_bFinalLast = true;
/*
if (_strOut.right(5) == "block")
{
ReLoadList();
}
*/
m_strListURL.clear();
foreach(QString str,_strOut.split("\n"))
{
@@ -116,6 +122,8 @@ void SNaverCafeManage::processFinished(QProcess *_pPro,QString _strOut)
{
m_nMode = E_PROCESS_LIST_RUN;
CheckLast();
if(m_bLast == false)
ReLoadList();
}
else
m_nMode = E_PROCESS_URL_RUN;
@@ -134,3 +142,10 @@ void SNaverCafeManage::processFinished(QProcess *_pPro,QString _strOut)
break;
}
}
void SNaverCafeManage::ReLoadList()
{
m_nMode = E_PROCESS_LIST_RUN;
m_ncList -= 10;
m_pMain->InsertLog("Reload List");
}

View File

@@ -22,6 +22,7 @@ protected:
bool Update();
void Start();
void processFinished(QProcess *pPro,QString _strOut);
void ReLoadList();
};
#endif // SNAVERCAFEMANAGE_H